summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorYoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>2007-12-12 22:20:19 +0900
committerRalf Baechle <ralf@linux-mips.org>2008-01-29 10:15:00 +0000
commit71466dd477c7a67d188d1d8310c7016a88531a04 (patch)
tree7836b852fff6c6d3bf738685e1a2484d07560c36 /arch/mips
parent991f8b6ac5a7284612679f4a095578b460555e8f (diff)
[MIPS] remove unneeded button check for reset
Removed unneeded button check for reset. Because, the Cobalt has power switch. Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/cobalt/reset.c21
1 files changed, 2 insertions, 19 deletions
diff --git a/arch/mips/cobalt/reset.c b/arch/mips/cobalt/reset.c
index 71eb4ccc4bc..c3d1baa5bcf 100644
--- a/arch/mips/cobalt/reset.c
+++ b/arch/mips/cobalt/reset.c
@@ -10,7 +10,6 @@
*/
#include <linux/init.h>
#include <linux/io.h>
-#include <linux/jiffies.h>
#include <linux/leds.h>
#include <cobalt.h>
@@ -29,29 +28,13 @@ device_initcall(ledtrig_power_off_init);
void cobalt_machine_halt(void)
{
- int state, last, diff;
- unsigned long mark;
-
/*
* turn on power off LED on RaQ
- *
- * restart if ENTER and SELECT are pressed
*/
-
- last = COBALT_KEY_PORT;
-
led_trigger_event(power_off_led_trigger, LED_FULL);
- for (state = 0;;) {
- diff = COBALT_KEY_PORT ^ last;
- last ^= diff;
-
- if((diff & (COBALT_KEY_ENTER | COBALT_KEY_SELECT)) && !(~last & (COBALT_KEY_ENTER | COBALT_KEY_SELECT)))
- writeb(RESET, RESET_PORT);
-
- for (mark = jiffies; jiffies - mark < HZ;)
- ;
- }
+ local_irq_disable();
+ while (1) ;
}
void cobalt_machine_restart(char *command)