@@ -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__ */
@@ -42,7 +42,7 @@ static void __iomem *mxs_clkctrl_reset_addr;
/*
* Reset the system. It is called by machine_restart().
*/
-void arch_reset(char mode, const char *cmd)
+static void mxs_arch_reset(char mode, const char *cmd)
{
/* reset the chip */
__mxs_setl(MXS_CLKCTRL_RESET_CHIP, mxs_clkctrl_reset_addr);
@@ -68,6 +68,8 @@ static int __init mxs_arch_reset_init(void)
if (!IS_ERR(clk))
clk_enable(clk);
+ arm_arch_reset = mxs_arch_reset;
+
return 0;
}
core_initcall(mxs_arch_reset_init);
This patch updates mach-mxs to use arm_arch_reset instead of arch_reset. Signed-off-by: Will Deacon <will.deacon@arm.com> --- arch/arm/mach-mxs/include/mach/system.h | 4 +++- arch/arm/mach-mxs/system.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)