Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd1661e2 authored by Russell King's avatar Russell King
Browse files

ARM: restart: spear: use new restart hook 



Hook these platforms restart code into the new restart hook rather
than using arch_reset().

Acked-by: default avatarViresh Kumar <viresh.kumar@st.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent b95ff9fe

arch/arm/mach-spear3xx/include/mach/generic.h

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ void __init spear3xx_map_io(void); 
void __init spear3xx_init_irq(void);

void __init spear3xx_init(void);



void spear_restart(char, const char *);



/* pad mux declarations */

#define PMX_FIRDA_MASK		(1 << 14)

#define PMX_I2C_MASK		(1 << 13)

arch/arm/mach-spear3xx/spear300_evb.c

+1 −0
Original line number Diff line number Diff line
@@ -69,4 +69,5 @@ MACHINE_START(SPEAR300, "ST-SPEAR300-EVB") 
	.init_irq	=	spear3xx_init_irq,

	.timer		=	&spear3xx_timer,

	.init_machine	=	spear300_evb_init,

	.restart	=	spear_restart,

MACHINE_END

arch/arm/mach-spear3xx/spear310_evb.c

+1 −0
Original line number Diff line number Diff line
@@ -75,4 +75,5 @@ MACHINE_START(SPEAR310, "ST-SPEAR310-EVB") 
	.init_irq	=	spear3xx_init_irq,

	.timer		=	&spear3xx_timer,

	.init_machine	=	spear310_evb_init,

	.restart	=	spear_restart,

MACHINE_END

arch/arm/mach-spear3xx/spear320_evb.c

+1 −0
Original line number Diff line number Diff line
@@ -73,4 +73,5 @@ MACHINE_START(SPEAR320, "ST-SPEAR320-EVB") 
	.init_irq	=	spear3xx_init_irq,

	.timer		=	&spear3xx_timer,

	.init_machine	=	spear320_evb_init,

	.restart	=	spear_restart,

MACHINE_END

arch/arm/mach-spear6xx/include/mach/generic.h

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ void __init spear6xx_init(void); 
void __init spear600_init(void);

void __init spear6xx_clk_init(void);



void spear_restart(char, const char *);



/* Add spear600 machine device structure declarations here */



#endif /* __MACH_GENERIC_H */