ARM: Provide default restart handler
Subsystems (3)
RFC PATCH 1/1 ARM: Provide default restart handler
This patch provides default restart handler if it is not explicitly specified.
Signed-off-by Alexander Shiyan <[email protected]>
--- arch/arm/kernel/setup.c | 7 +++++++ arch/arm/mach-clps711x/board-autcpu12.c | 1 - arch/arm/mach-clps711x/board-cdb89712.c | 1 - arch/arm/mach-clps711x/board-clep7312.c | 1 - arch/arm/mach-clps711x/board-edb7211.c | 1 - arch/arm/mach-clps711x/board-p720t.c | 1 - arch/arm/mach-clps711x/common.c | 5 ----- arch/arm/mach-clps711x/common.h | 3 --- arch/arm/mach-mmp/brownstone.c | 1 - arch/arm/mach-mmp/common.c | 5 ----- arch/arm/mach-mmp/common.h | 1 - arch/arm/mach-mmp/flint.c | 1 - arch/arm/mach-mmp/jasper.c | 1 - arch/arm/mach-mmp/tavorevb.c | 1 - arch/arm/mach-mmp/ttc_dkb.c | 1 - 15 files changed, 7 insertions(+), 24 deletions(-)
arch/arm/kernel/setup.c +7 -0
@@ -862,6 +862,11 @@ void __init hyp_mode_check(void)#endif } +static void default_arm_restart (enum reboot_mode mode,const char *cmd) +{ +soft_restart (0 ); +} +void __init setup_arch (char **cmdline_p) {const struct machine_desc *mdesc;
@@ -900,6 +905,8 @@ void __init setup_arch(char **cmdline_p)if (mdesc->restart) arm_pm_restart = mdesc->restart; +else + arm_pm_restart = default_arm_restart;unflatten_device_tree ();
arch/arm/mach-clps711x/board-autcpu12.c +0 -1
@@ -273,6 +273,5 @@ MACHINE_START(AUTCPU12, "autronix autcpu12") .init_machine = autcpu12_init, .init_late = autcpu12_init_late, .handle_irq = clps711x_handle_irq, - .restart = clps711x_restart,MACHINE_END
arch/arm/mach-clps711x/board-cdb89712.c +0 -1
@@ -146,5 +146,4 @@ MACHINE_START(CDB89712, "Cirrus-CDB89712") .init_time = clps711x_timer_init, .init_machine = cdb89712_init, .handle_irq = clps711x_handle_irq, - .restart = clps711x_restart,MACHINE_END
arch/arm/mach-clps711x/board-clep7312.c +0 -1
@@ -43,5 +43,4 @@ MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312") .init_irq = clps711x_init_irq, .init_time = clps711x_timer_init, .handle_irq = clps711x_handle_irq, - .restart = clps711x_restart,MACHINE_END
arch/arm/mach-clps711x/board-edb7211.c +0 -1
@@ -187,5 +187,4 @@ MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)") .init_machine = edb7211_init, .init_late = edb7211_init_late, .handle_irq = clps711x_handle_irq, - .restart = clps711x_restart,MACHINE_END
arch/arm/mach-clps711x/board-p720t.c +0 -1
@@ -372,5 +372,4 @@ MACHINE_START(P720T, "ARM-Prospector720T") .init_machine = p720t_init, .init_late = p720t_init_late, .handle_irq = clps711x_handle_irq, - .restart = clps711x_restart,MACHINE_END
arch/arm/mach-clps711x/common.c +0 -5
@@ -384,11 +384,6 @@ void __init clps711x_timer_init(void)setup_irq (IRQ_TC2OI , &clps711x_timer_irq); } -void clps711x_restart (enum reboot_mode mode,const char *cmd) -{ -soft_restart (0 ); -} -static void clps711x_idle (void ) {clps_writel (1 ,HALT );
arch/arm/mach-clps711x/common.h +0 -3
@@ -4,8 +4,6 @@* Common bits. */ -#include <linux/reboot.h> -#define CLPS711X_NR_IRQS (33)#define CLPS711X_NR_GPIO (4 * 8 + 3)#define CLPS711X_GPIO (prt, bit) ((prt) * 8 + (bit))
@@ -14,5 +12,4 @@ extern void clps711x_map_io(void);extern void clps711x_init_irq (void );extern void clps711x_timer_init (void );extern void clps711x_handle_irq (struct pt_regs *regs); -extern void clps711x_restart (enum reboot_mode mode,const char *cmd);extern void clps711x_init_early (void );
arch/arm/mach-mmp/brownstone.c +0 -1
@@ -227,5 +227,4 @@ MACHINE_START(BROWNSTONE, "Brownstone Development Platform") .init_irq = mmp2_init_irq, .init_time = mmp2_timer_init, .init_machine = brownstone_init, - .restart = mmp_restart,MACHINE_END
arch/arm/mach-mmp/common.c +0 -5
@@ -46,8 +46,3 @@ void __init mmp_map_io(void)/* this is early, initialize mmp_chip_id here */ mmp_chip_id =__raw_readl (MMP_CHIPID ); } - -void mmp_restart (enum reboot_mode mode,const char *cmd) -{ -soft_restart (0 ); -}
arch/arm/mach-mmp/common.h +0 -1
@@ -4,7 +4,6 @@extern void timer_init (int irq);extern void __init mmp_map_io (void ); -extern void mmp_restart (enum reboot_mode ,const char *);extern void __init pxa168_clk_init (void );extern void __init pxa910_clk_init (void );extern void __init mmp2_clk_init (void );
arch/arm/mach-mmp/flint.c +0 -1
@@ -130,5 +130,4 @@ MACHINE_START(FLINT, "Flint Development Platform") .init_irq = mmp2_init_irq, .init_time = mmp2_timer_init, .init_machine = flint_init, - .restart = mmp_restart,MACHINE_END
arch/arm/mach-mmp/jasper.c +0 -1
@@ -184,5 +184,4 @@ MACHINE_START(MARVELL_JASPER, "Jasper Development Platform") .init_irq = mmp2_init_irq, .init_time = mmp2_timer_init, .init_machine = jasper_init, - .restart = mmp_restart,MACHINE_END
arch/arm/mach-mmp/tavorevb.c +0 -1
@@ -112,5 +112,4 @@ MACHINE_START(TAVOREVB, "PXA910 Evaluation Board (aka TavorEVB)") .init_irq = pxa910_init_irq, .init_time = pxa910_timer_init, .init_machine = tavorevb_init, - .restart = mmp_restart,MACHINE_END
arch/arm/mach-mmp/ttc_dkb.c +0 -1
@@ -311,5 +311,4 @@ MACHINE_START(TTC_DKB, "PXA910-based TTC_DKB Development Platform") .init_irq = pxa910_init_irq, .init_time = pxa910_timer_init, .init_machine = ttc_dkb_init, - .restart = mmp_restart,MACHINE_END
Signature · 1 line
1.8.3.2
RFC PATCH 1/1 ARM: Provide default restart handler
Quoted 1 line · Alexander Shiyan
This patch provides default restart handler if it is not explicitly specified.
So what happens on those platforms where it's already not specified? There's 75 files with a machine descriptor without a .restart hook specified or reference to arm_pm_restart. You're potentially changing the behaviour for those.