Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[MIPS] Cobalt: Move reset port definition to arch/mips/cobalt/reset.c

Browse source 
It's only used in arch/mips/cobalt/reset.c.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Yoichi Yuasa 2007-10-02 23:17:38 +09:00 committed by Ralf Baechle
parent 5a860424a1
commit 3282bd3cb0
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/mips/cobalt/reset.c
View file

@ -9,11 +9,15 @@
* Copyright (C) 2001 by Liam Davies (ldavies@agile.tv)
*/
#include <linux/init.h>
#include <linux/io.h>
#include <linux/jiffies.h>
#include <linux/leds.h>
#include <cobalt.h>
#define RESET_PORT ((void __iomem *)CKSEG1ADDR(0x1c000000))
#define RESET 0x0f
DEFINE_LED_TRIGGER(power_off_led_trigger);
static int __init ledtrig_power_off_init(void)
@ -43,7 +47,7 @@ void cobalt_machine_halt(void)
last ^= diff;
if((diff & (COBALT_KEY_ENTER | COBALT_KEY_SELECT)) && !(~last & (COBALT_KEY_ENTER | COBALT_KEY_SELECT)))
COBALT_LED_PORT = COBALT_LED_RESET;
writeb(RESET, RESET_PORT);
for (mark = jiffies; jiffies - mark < HZ;)
;
@ -52,7 +56,7 @@ void cobalt_machine_halt(void)
void cobalt_machine_restart(char *command)
{
COBALT_LED_PORT = COBALT_LED_RESET;
writeb(RESET, RESET_PORT);
/* we should never get here */
cobalt_machine_halt();

7
include/asm-mips/mach-cobalt/cobalt.h
View file

@ -22,13 +22,6 @@ extern int cobalt_board_id;
#define COBALT_BRD_ID_QUBE2 0x5
#define COBALT_BRD_ID_RAQ2 0x6
#define COBALT_LED_PORT (*(volatile unsigned char *) CKSEG1ADDR(0x1c000000))
# define COBALT_LED_BAR_LEFT (1 << 0) /* Qube */
# define COBALT_LED_BAR_RIGHT (1 << 1) /* Qube */
# define COBALT_LED_WEB (1 << 2) /* RaQ */
# define COBALT_LED_POWER_OFF (1 << 3) /* RaQ */
# define COBALT_LED_RESET 0x0f
#define COBALT_KEY_PORT ((~*(volatile unsigned int *) CKSEG1ADDR(0x1d000000) >> 24) & COBALT_KEY_MASK)
# define COBALT_KEY_CLEAR (1 << 1)
# define COBALT_KEY_LEFT (1 << 2)