Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[pandora-kernel.git] / arch / arm / plat-mxc / system.c

diff --git a/arch/arm/plat-mxc/system.c b/arch/arm/plat-mxc/system.c
index 79c3757..97f4279 100644 (file)
--- a/arch/arm/plat-mxc/system.c
+++ b/arch/arm/plat-mxc/system.c
@@ -27,32 +27,38 @@
 #include <linux/delay.h>
 
 #include <mach/hardware.h>
+#include <mach/common.h>
 #include <asm/proc-fns.h>
 #include <asm/system.h>
 
-#ifdef CONFIG_ARCH_MX1
-#define WDOG_WCR_REG           IO_ADDRESS(WDT_BASE_ADDR)
-#define WDOG_WCR_ENABLE                (1 << 0)
-#else
-#define WDOG_WCR_REG           IO_ADDRESS(WDOG_BASE_ADDR)
-#define WDOG_WCR_ENABLE                (1 << 2)
-#endif
+static void __iomem *wdog_base;
 
 /*
  * Reset the system. It is called by machine_restart().
  */
 void arch_reset(char mode, const char *cmd)
 {
-       if (!cpu_is_mx1()) {
+       unsigned int wcr_enable;
+
+#ifdef CONFIG_ARCH_MXC91231
+       if (cpu_is_mxc91231()) {
+               mxc91231_arch_reset(mode, cmd);
+               return;
+       }
+#endif
+       if (cpu_is_mx1()) {
+               wcr_enable = (1 << 0);
+       } else {
                struct clk *clk;
 
                clk = clk_get_sys("imx-wdt.0", NULL);
                if (!IS_ERR(clk))
                        clk_enable(clk);
+               wcr_enable = (1 << 2);
        }
 
        /* Assert SRS signal */
-       __raw_writew(WDOG_WCR_ENABLE, WDOG_WCR_REG);
+       __raw_writew(wcr_enable, wdog_base);
 
        /* wait for reset to assert... */
        mdelay(500);
@@ -65,3 +71,8 @@ void arch_reset(char mode, const char *cmd)
        /* we'll take a jump through zero as a poor second */
        cpu_reset(0);
 }
+
+void mxc_arch_reset_init(void __iomem *base)
+{
+       wdog_base = base;
+}