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

Commit 6f91c5a4 authored by Russell King's avatar Russell King
Browse files

ARM: restart: mxs: use new restart hook 



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

Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 65ea7884

arch/arm/mach-mxs/include/mach/common.h

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ struct clk; 
extern const u32 *mxs_get_ocotp(void);

extern int mxs_reset_block(void __iomem *);

extern void mxs_timer_init(struct clk *, int);

extern void mxs_restart(char, const char *);



extern int mx23_register_gpios(void);

extern int mx23_clocks_init(void);

arch/arm/mach-mxs/include/mach/system.h

+3 −1
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ static inline void arch_idle(void) 
	cpu_do_idle();

}



void arch_reset(char mode, const char *cmd);

static inline void arch_reset(char mode, const char *cmd)

{

}



#endif /* __MACH_MXS_SYSTEM_H__ */

arch/arm/mach-mxs/mach-m28evk.c

+1 −0
Original line number Diff line number Diff line
@@ -363,4 +363,5 @@ MACHINE_START(M28EVK, "DENX M28 EVK") 
	.init_irq	= mx28_init_irq,

	.timer		= &m28evk_timer,

	.init_machine	= m28evk_init,

	.restart	= mxs_restart,

MACHINE_END

arch/arm/mach-mxs/mach-mx23evk.c

+1 −0
Original line number Diff line number Diff line
@@ -184,4 +184,5 @@ MACHINE_START(MX23EVK, "Freescale MX23 EVK") 
	.init_irq	= mx23_init_irq,

	.timer		= &mx23evk_timer,

	.init_machine	= mx23evk_init,

	.restart	= mxs_restart,

MACHINE_END

arch/arm/mach-mxs/mach-mx28evk.c

+1 −0
Original line number Diff line number Diff line
@@ -501,4 +501,5 @@ MACHINE_START(MX28EVK, "Freescale MX28 EVK") 
	.init_irq	= mx28_init_irq,

	.timer		= &mx28evk_timer,

	.init_machine	= mx28evk_init,

	.restart	= mxs_restart,

MACHINE_END