diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-05 15:43:30 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 12:57:15 +0000 |
| commit | 6f91c5a46cf8f083e9316ce238d1aadb629f41dc (patch) | |
| tree | 3732727c82153e045b903abd243ecf6e45cd649c /arch/arm/mach-mxs/include/mach | |
| parent | 65ea7884bc12c45bc19424b0287aa3b24b022721 (diff) | |
| download | blackbird-op-linux-6f91c5a46cf8f083e9316ce238d1aadb629f41dc.tar.gz blackbird-op-linux-6f91c5a46cf8f083e9316ce238d1aadb629f41dc.zip | |
ARM: restart: mxs: use new restart hook
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>
Diffstat (limited to 'arch/arm/mach-mxs/include/mach')
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/common.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/system.h | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/include/mach/common.h b/arch/arm/mach-mxs/include/mach/common.h index 635bb5d9a20a..1388485414c9 100644 --- a/arch/arm/mach-mxs/include/mach/common.h +++ b/arch/arm/mach-mxs/include/mach/common.h @@ -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); diff --git a/arch/arm/mach-mxs/include/mach/system.h b/arch/arm/mach-mxs/include/mach/system.h index 0e428239b433..bcd8989285d6 100644 --- a/arch/arm/mach-mxs/include/mach/system.h +++ b/arch/arm/mach-mxs/include/mach/system.h @@ -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__ */ |
