diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-06 12:12:08 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:57:15 -0500 |
commit | 65ea7884bc12c45bc19424b0287aa3b24b022721 (patch) | |
tree | fee5a01d62749664c92bdef863f8aa6c0a588635 /arch/arm/plat-mxc/system.c | |
parent | 9635f9cd49b72bddb7e40fcbc151240677b5cf5e (diff) |
ARM: restart: mxc: use new restart hook
Hook these platforms restart code into the new restart hook rather
than using arch_reset().
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/plat-mxc/system.c')
-rw-r--r-- | arch/arm/plat-mxc/system.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/plat-mxc/system.c b/arch/arm/plat-mxc/system.c index 7e5c76ea4466..3599bf2cfd4f 100644 --- a/arch/arm/plat-mxc/system.c +++ b/arch/arm/plat-mxc/system.c | |||
@@ -37,17 +37,10 @@ static void __iomem *wdog_base; | |||
37 | /* | 37 | /* |
38 | * Reset the system. It is called by machine_restart(). | 38 | * Reset the system. It is called by machine_restart(). |
39 | */ | 39 | */ |
40 | void arch_reset(char mode, const char *cmd) | 40 | void mxc_restart(char mode, const char *cmd) |
41 | { | 41 | { |
42 | unsigned int wcr_enable; | 42 | unsigned int wcr_enable; |
43 | 43 | ||
44 | #ifdef CONFIG_MACH_MX51_EFIKAMX | ||
45 | if (machine_is_mx51_efikamx()) { | ||
46 | mx51_efikamx_reset(); | ||
47 | return; | ||
48 | } | ||
49 | #endif | ||
50 | |||
51 | if (cpu_is_mx1()) { | 44 | if (cpu_is_mx1()) { |
52 | wcr_enable = (1 << 0); | 45 | wcr_enable = (1 << 0); |
53 | } else { | 46 | } else { |