Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / plat-mxc / system.c

diff --git a/arch/arm/plat-mxc/system.c b/arch/arm/plat-mxc/system.c
index 925bce4607e78bc91f2fb4605e4c8d5195027ff2..3455fc0575a620d87c6790128a9b0e03a9b83517 100644 (file)
--- a/arch/arm/plat-mxc/system.c
+++ b/arch/arm/plat-mxc/system.c
@@ -26,6 +26,7 @@
 #include <mach/common.h>
 #include <asm/proc-fns.h>
 #include <asm/system.h>
+#include <asm/mach-types.h>
 
 static void __iomem *wdog_base;
 
@@ -42,12 +43,19 @@ void arch_reset(char mode, const char *cmd)
                return;
        }
 #endif
+#ifdef CONFIG_MACH_MX51_EFIKAMX
+       if (machine_is_mx51_efikamx()) {
+               mx51_efikamx_reset();
+               return;
+       }
+#endif
+
        if (cpu_is_mx1()) {
                wcr_enable = (1 << 0);
        } else {
                struct clk *clk;
 
-               clk = clk_get_sys("imx-wdt.0", NULL);
+               clk = clk_get_sys("imx2-wdt.0", NULL);
                if (!IS_ERR(clk))
                        clk_enable(clk);
                wcr_enable = (1 << 2);