diff options
Diffstat (limited to 'arch/arm/plat-mxc/system.c')
-rw-r--r-- | arch/arm/plat-mxc/system.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/system.c b/arch/arm/plat-mxc/system.c index 925bce4607e7..3455fc0575a6 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,12 +43,19 @@ 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 { |
48 | struct clk *clk; | 56 | struct clk *clk; |
49 | 57 | ||
50 | clk = clk_get_sys("imx-wdt.0", NULL); | 58 | clk = clk_get_sys("imx2-wdt.0", NULL); |
51 | if (!IS_ERR(clk)) | 59 | if (!IS_ERR(clk)) |
52 | clk_enable(clk); | 60 | clk_enable(clk); |
53 | wcr_enable = (1 << 2); | 61 | wcr_enable = (1 << 2); |