leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: restart: mxs: use new restart hook

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

Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2011-11-05 15:43:30 +00:00
parent 65ea7884bc
commit 6f91c5a46c
8 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-mxs/include/mach/common.h
View File

@ -16,6 +16,7 @@ struct clk;
extern const u32 *mxs_get_ocotp(void); extern const u32 *mxs_get_ocotp(void);
extern int mxs_reset_block(void __iomem *); extern int mxs_reset_block(void __iomem *);
extern void mxs_timer_init(struct clk *, int); extern void mxs_timer_init(struct clk *, int);
extern void mxs_restart(char, const char *);
extern int mx23_register_gpios(void); extern int mx23_register_gpios(void);
extern int mx23_clocks_init(void); extern int mx23_clocks_init(void);

4
arch/arm/mach-mxs/include/mach/system.h
View File

@ -22,6 +22,8 @@ static inline void arch_idle(void)
cpu_do_idle(); 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__ */ #endif /* __MACH_MXS_SYSTEM_H__ */

1
arch/arm/mach-mxs/mach-m28evk.c
View File

@ -363,4 +363,5 @@ MACHINE_START(M28EVK, "DENX M28 EVK")
.init_irq = mx28_init_irq, .init_irq = mx28_init_irq,
.timer = &m28evk_timer, .timer = &m28evk_timer,
.init_machine = m28evk_init, .init_machine = m28evk_init,
.restart = mxs_restart,
MACHINE_END MACHINE_END

1
arch/arm/mach-mxs/mach-mx23evk.c
View File

@ -184,4 +184,5 @@ MACHINE_START(MX23EVK, "Freescale MX23 EVK")
.init_irq = mx23_init_irq, .init_irq = mx23_init_irq,
.timer = &mx23evk_timer, .timer = &mx23evk_timer,
.init_machine = mx23evk_init, .init_machine = mx23evk_init,
.restart = mxs_restart,
MACHINE_END MACHINE_END

1
arch/arm/mach-mxs/mach-mx28evk.c
View File

@ -501,4 +501,5 @@ MACHINE_START(MX28EVK, "Freescale MX28 EVK")
.init_irq = mx28_init_irq, .init_irq = mx28_init_irq,
.timer = &mx28evk_timer, .timer = &mx28evk_timer,
.init_machine = mx28evk_init, .init_machine = mx28evk_init,
.restart = mxs_restart,
MACHINE_END MACHINE_END

1
arch/arm/mach-mxs/mach-stmp378x_devb.c
View File

@ -117,4 +117,5 @@ MACHINE_START(STMP378X, "STMP378X")
.init_irq = mx23_init_irq, .init_irq = mx23_init_irq,
.timer = &stmp378x_dvb_timer, .timer = &stmp378x_dvb_timer,
.init_machine = stmp378x_dvb_init, .init_machine = stmp378x_dvb_init,
.restart = mxs_restart,
MACHINE_END MACHINE_END

1
arch/arm/mach-mxs/mach-tx28.c
View File

@ -178,4 +178,5 @@ MACHINE_START(TX28, "Ka-Ro electronics TX28 module")
.init_irq = mx28_init_irq, .init_irq = mx28_init_irq,
.timer = &tx28_timer, .timer = &tx28_timer,
.init_machine = tx28_stk5v3_init, .init_machine = tx28_stk5v3_init,
.restart = mxs_restart,
MACHINE_END MACHINE_END

2
arch/arm/mach-mxs/system.c
View File

@ -42,7 +42,7 @@ static void __iomem *mxs_clkctrl_reset_addr;
/* /*
* Reset the system. It is called by machine_restart(). * Reset the system. It is called by machine_restart().
*/ */
void arch_reset(char mode, const char *cmd) void mxs_restart(char mode, const char *cmd)
{ {
/* reset the chip */ /* reset the chip */
__mxs_setl(MXS_CLKCTRL_RESET_CHIP, mxs_clkctrl_reset_addr); __mxs_setl(MXS_CLKCTRL_RESET_CHIP, mxs_clkctrl_reset_addr);