MIPS: Alchemy: fix up residual devboard poweroff/reboot code.
PATCH v2 1/1 MIPS: Alchemy: fix up residual devboard poweroff/reboot code.
Clean out stray unused board_reset() calls in pb1x boards, the pb1000 is different from the rest and gets private methods.
(Cleanup after 32fd6901a6d8d19f94e4de6be4e4b552ab078620)
Signed-off-by Manuel Lauss <[email protected]>
---
v2: fix formatting as pointed out by Sergei
arch/mips/alchemy/devboards/pb1000/board_setup.c | 16 +++++++++++++++- arch/mips/alchemy/devboards/pb1100/board_setup.c | 5 ----- arch/mips/alchemy/devboards/pb1200/board_setup.c | 6 ------ arch/mips/alchemy/devboards/pb1500/board_setup.c | 5 ----- arch/mips/alchemy/devboards/pb1550/board_setup.c | 5 ----- 5 files changed, 15 insertions(+), 22 deletions(-)
arch/mips/alchemy/devboards/pb1000/board_setup.c +15 -1
@@ -27,8 +27,10 @@#include <linux/gpio.h> #include <linux/init.h> #include <linux/interrupt.h> +#include <linux/pm.h> #include <asm/mach-au1x00/au1000.h> #include <asm/mach-pb1x00/pb1000.h> +#include <asm/reboot.h> #include <prom.h> #include "../platform.h"
@@ -38,8 +40,16 @@ const char *get_system_type(void)return "Alchemy Pb1000" ; } -void board_reset (void ) +static void board_reset (char *c) { + asmvolatile ("jr %0" : :"r" (0xbfc00000 )); +} + +static void board_power_off (void ) +{ +printk (KERN_ALERT "It's now safe to remove power\n" ); +while (1 ) + asmvolatile (".set mips3 ; wait ; .set mips1" ); }void __init board_setup (void )
@@ -177,6 +187,10 @@ void __init board_setup(void)au_writel (au_readl (SYS_POWERCTRL ) | (0x3 <<5 ),SYS_POWERCTRL );break ; } + + pm_power_off = board_power_off; + _machine_halt = board_power_off; + _machine_restart = board_reset; }static int __init pb1000_init_irq (void )
arch/mips/alchemy/devboards/pb1100/board_setup.c +0 -5
@@ -39,11 +39,6 @@ const char *get_system_type(void)return "Alchemy Pb1100" ; } -void board_reset (void ) -{ -bcsr_write (BCSR_SYSTEM ,0 ); -} -void __init board_setup (void ) {volatile void __iomem *base = (volatile void __iomem *)0xac000000UL ;
arch/mips/alchemy/devboards/pb1200/board_setup.c +0 -6
@@ -48,12 +48,6 @@ const char *get_system_type(void)return "Alchemy Pb1200" ; } -void board_reset (void ) -{ -bcsr_write (BCSR_RESETS ,0 ); -bcsr_write (BCSR_SYSTEM ,0 ); -} -void __init board_setup (void ) {printk (KERN_INFO "AMD Alchemy Pb1200 Board\n" );
arch/mips/alchemy/devboards/pb1500/board_setup.c +0 -5
@@ -45,11 +45,6 @@ const char *get_system_type(void)return "Alchemy Pb1500" ; } -void board_reset (void ) -{ -bcsr_write (BCSR_SYSTEM ,0 ); -} -void __init board_setup (void ) {u32 pin_func;
arch/mips/alchemy/devboards/pb1550/board_setup.c +0 -5
@@ -48,11 +48,6 @@ const char *get_system_type(void)return "Alchemy Pb1550" ; } -void board_reset (void ) -{ -bcsr_write (BCSR_SYSTEM ,0 ); -} -void __init board_setup (void ) {u32 pin_func;
Signature · 1 line
1.7.0.3
Quoted 6 lines · Manuel Lauss
Clean out stray unused
board_reset()calls in pb1x boards, the pb1000 is different from the rest and gets private methods.(Cleanup after
32fd6901a6d8d19f94e4de6be4e4b552ab078620)Signed-off-by Manuel Lauss <[email protected]>
Thanks, queued for 2.6.35.
Ralf