diff options
Diffstat (limited to 'arch/mips/txx9/jmr3927/setup.c')
-rw-r--r-- | arch/mips/txx9/jmr3927/setup.c | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/arch/mips/txx9/jmr3927/setup.c b/arch/mips/txx9/jmr3927/setup.c index 7c16c402ff60..fa0503efc840 100644 --- a/arch/mips/txx9/jmr3927/setup.c +++ b/arch/mips/txx9/jmr3927/setup.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include <linux/types.h> | 32 | #include <linux/types.h> |
33 | #include <linux/ioport.h> | 33 | #include <linux/ioport.h> |
34 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
35 | #include <linux/pm.h> | ||
36 | #include <linux/platform_device.h> | 35 | #include <linux/platform_device.h> |
37 | #include <linux/gpio.h> | 36 | #include <linux/gpio.h> |
38 | #ifdef CONFIG_SERIAL_TXX9 | 37 | #ifdef CONFIG_SERIAL_TXX9 |
@@ -46,13 +45,12 @@ | |||
46 | #include <asm/txx9/jmr3927.h> | 45 | #include <asm/txx9/jmr3927.h> |
47 | #include <asm/mipsregs.h> | 46 | #include <asm/mipsregs.h> |
48 | 47 | ||
49 | extern void puts(const char *cp); | ||
50 | |||
51 | /* don't enable - see errata */ | 48 | /* don't enable - see errata */ |
52 | static int jmr3927_ccfg_toeon; | 49 | static int jmr3927_ccfg_toeon; |
53 | 50 | ||
54 | static inline void do_reset(void) | 51 | static void jmr3927_machine_restart(char *command) |
55 | { | 52 | { |
53 | local_irq_disable(); | ||
56 | #if 1 /* Resetting PCI bus */ | 54 | #if 1 /* Resetting PCI bus */ |
57 | jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR); | 55 | jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR); |
58 | jmr3927_ioc_reg_out(JMR3927_IOC_RESET_PCI, JMR3927_IOC_RESET_ADDR); | 56 | jmr3927_ioc_reg_out(JMR3927_IOC_RESET_PCI, JMR3927_IOC_RESET_ADDR); |
@@ -61,25 +59,8 @@ static inline void do_reset(void) | |||
61 | jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR); | 59 | jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR); |
62 | #endif | 60 | #endif |
63 | jmr3927_ioc_reg_out(JMR3927_IOC_RESET_CPU, JMR3927_IOC_RESET_ADDR); | 61 | jmr3927_ioc_reg_out(JMR3927_IOC_RESET_CPU, JMR3927_IOC_RESET_ADDR); |
64 | } | 62 | /* fallback */ |
65 | 63 | (*_machine_halt)(); | |
66 | static void jmr3927_machine_restart(char *command) | ||
67 | { | ||
68 | local_irq_disable(); | ||
69 | puts("Rebooting..."); | ||
70 | do_reset(); | ||
71 | } | ||
72 | |||
73 | static void jmr3927_machine_halt(void) | ||
74 | { | ||
75 | puts("JMR-TX3927 halted.\n"); | ||
76 | while (1); | ||
77 | } | ||
78 | |||
79 | static void jmr3927_machine_power_off(void) | ||
80 | { | ||
81 | puts("JMR-TX3927 halted. Please turn off the power.\n"); | ||
82 | while (1); | ||
83 | } | 64 | } |
84 | 65 | ||
85 | static void __init jmr3927_time_init(void) | 66 | static void __init jmr3927_time_init(void) |
@@ -102,8 +83,6 @@ static void __init jmr3927_mem_setup(void) | |||
102 | set_io_port_base(JMR3927_PORT_BASE + JMR3927_PCIIO); | 83 | set_io_port_base(JMR3927_PORT_BASE + JMR3927_PCIIO); |
103 | 84 | ||
104 | _machine_restart = jmr3927_machine_restart; | 85 | _machine_restart = jmr3927_machine_restart; |
105 | _machine_halt = jmr3927_machine_halt; | ||
106 | pm_power_off = jmr3927_machine_power_off; | ||
107 | 86 | ||
108 | /* Reboot on panic */ | 87 | /* Reboot on panic */ |
109 | panic_timeout = 180; | 88 | panic_timeout = 180; |