diff options
author | Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org> | 2010-10-27 08:40:55 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-11-24 03:57:16 -0500 |
commit | c2932bf47001697fc48e89f1d136532703ed4779 (patch) | |
tree | ef58c1fa9596da632ae8080f9757b4acd9cbb4b1 /arch/arm/plat-mxc | |
parent | c6e34a4cbe8d4e126c3f603d11cce6979952cbb1 (diff) |
efikamx: add reset
The efikamx board is using a gpio to reset the board so add support
for it
Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/common.h | 2 | ||||
-rw-r--r-- | arch/arm/plat-mxc/system.c | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/plat-mxc/include/mach/common.h index 7a1e1f89ff09..05676fbd1d63 100644 --- a/arch/arm/plat-mxc/include/mach/common.h +++ b/arch/arm/plat-mxc/include/mach/common.h | |||
@@ -50,5 +50,5 @@ extern void mxc_arch_reset_init(void __iomem *); | |||
50 | extern void mxc91231_power_off(void); | 50 | extern void mxc91231_power_off(void); |
51 | extern void mxc91231_arch_reset(int, const char *); | 51 | extern void mxc91231_arch_reset(int, const char *); |
52 | extern void mxc91231_prepare_idle(void); | 52 | extern void mxc91231_prepare_idle(void); |
53 | 53 | extern void mx51_efikamx_reset(void); | |
54 | #endif | 54 | #endif |
diff --git a/arch/arm/plat-mxc/system.c b/arch/arm/plat-mxc/system.c index 925bce4607e7..c3972c583840 100644 --- a/arch/arm/plat-mxc/system.c +++ b/arch/arm/plat-mxc/system.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <mach/common.h> | 26 | #include <mach/common.h> |
27 | #include <asm/proc-fns.h> | 27 | #include <asm/proc-fns.h> |
28 | #include <asm/system.h> | 28 | #include <asm/system.h> |
29 | #include <asm/mach-types.h> | ||
29 | 30 | ||
30 | static void __iomem *wdog_base; | 31 | static void __iomem *wdog_base; |
31 | 32 | ||
@@ -42,6 +43,13 @@ void arch_reset(char mode, const char *cmd) | |||
42 | return; | 43 | return; |
43 | } | 44 | } |
44 | #endif | 45 | #endif |
46 | #ifdef CONFIG_MACH_MX51_EFIKAMX | ||
47 | if (machine_is_mx51_efikamx()) { | ||
48 | mx51_efikamx_reset(); | ||
49 | return; | ||
50 | } | ||
51 | #endif | ||
52 | |||
45 | if (cpu_is_mx1()) { | 53 | if (cpu_is_mx1()) { |
46 | wcr_enable = (1 << 0); | 54 | wcr_enable = (1 << 0); |
47 | } else { | 55 | } else { |