diff options
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/powertv/reset.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/mips/powertv/reset.c b/arch/mips/powertv/reset.c index 494c652c984b..0007652cb774 100644 --- a/arch/mips/powertv/reset.c +++ b/arch/mips/powertv/reset.c | |||
@@ -28,9 +28,6 @@ | |||
28 | #include <asm/mach-powertv/asic_regs.h> | 28 | #include <asm/mach-powertv/asic_regs.h> |
29 | #include "reset.h" | 29 | #include "reset.h" |
30 | 30 | ||
31 | static void mips_machine_restart(char *command); | ||
32 | static void mips_machine_halt(void); | ||
33 | |||
34 | static void mips_machine_restart(char *command) | 31 | static void mips_machine_restart(char *command) |
35 | { | 32 | { |
36 | #ifdef CONFIG_BOOTLOADER_DRIVER | 33 | #ifdef CONFIG_BOOTLOADER_DRIVER |
@@ -44,22 +41,7 @@ static void mips_machine_restart(char *command) | |||
44 | #endif | 41 | #endif |
45 | } | 42 | } |
46 | 43 | ||
47 | static void mips_machine_halt(void) | ||
48 | { | ||
49 | #ifdef CONFIG_BOOTLOADER_DRIVER | ||
50 | /* | ||
51 | * Call the bootloader's reset function to ensure | ||
52 | * that persistent data is flushed before hard reset | ||
53 | */ | ||
54 | kbldr_SetCauseAndReset(); | ||
55 | #else | ||
56 | writel(0x1, asic_reg_addr(watchdog)); | ||
57 | #endif | ||
58 | } | ||
59 | |||
60 | void mips_reboot_setup(void) | 44 | void mips_reboot_setup(void) |
61 | { | 45 | { |
62 | _machine_restart = mips_machine_restart; | 46 | _machine_restart = mips_machine_restart; |
63 | _machine_halt = mips_machine_halt; | ||
64 | pm_power_off = mips_machine_halt; | ||
65 | } | 47 | } |