Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] orion5x_wdt.c: add spinlocking
  [WATCHDOG] Orion: add hardware watchdog support
  [WATCHDOG] omap_wdt.c: cleanup a bit omap_wdt.c
  [WATCHDOG] omap_wdt.c: another ioremap() fix
  [WATCHDOG] omap_wdt.c: sync linux-omap changes
  [WATCHDOG] Add AT91SAM9X watchdog
  [WATCHDOG] Add driver for winbond w83697ug/uf watchdog feature
  [WATCHDOG] add watchdog driver IT8716 IT8726 IT8712J/K

2 files changed, 15 insertions, 8 deletions

diff --git a/arch/arm/mach-orion5x/include/mach/orion5x.h b/arch/arm/mach-orion5x/include/mach/orion5x.h
index e67c843baa02..9f5ce1ce5840 100644
--- a/arch/arm/mach-orion5x/include/mach/orion5x.h
+++ b/arch/arm/mach-orion5x/include/mach/orion5x.h
@@ -157,9 +157,11 @@
 #define CPU_CONF                ORION5X_BRIDGE_REG(0x100)
 #define CPU_CTRL                ORION5X_BRIDGE_REG(0x104)
 #define CPU_RESET_MASK          ORION5X_BRIDGE_REG(0x108)
+#define  WDT_RESET              0x0002
 #define CPU_SOFT_RESET          ORION5X_BRIDGE_REG(0x10c)
 #define POWER_MNG_CTRL_REG      ORION5X_BRIDGE_REG(0x11C)
 #define BRIDGE_CAUSE            ORION5X_BRIDGE_REG(0x110)
+#define  WDT_INT_REQ            0x0008
 #define BRIDGE_MASK             ORION5X_BRIDGE_REG(0x114)
 #define  BRIDGE_INT_TIMER0      0x0002
 #define  BRIDGE_INT_TIMER1      0x0004
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index a716ecd1db27..97187fa0ae52 100644
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -441,16 +441,8 @@ static inline void omap_init_uwire(void) {}
 
 #if     defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE)
 
-#ifdef CONFIG_ARCH_OMAP24XX
-#define OMAP_WDT_BASE           0x48022000
-#else
-#define OMAP_WDT_BASE           0xfffeb000
-#endif
-
 static struct resource wdt_resources[] = {
         {
-                .start          = OMAP_WDT_BASE,
-                .end            = OMAP_WDT_BASE + 0x4f,
                 .flags          = IORESOURCE_MEM,
         },
 };
@@ -464,6 +456,19 @@ static struct platform_device omap_wdt_device = {
 
 static void omap_init_wdt(void)
 {
+        if (cpu_is_omap16xx())
+                wdt_resources[0].start = 0xfffeb000;
+        else if (cpu_is_omap2420())
+                wdt_resources[0].start = 0x48022000; /* WDT2 */
+        else if (cpu_is_omap2430())
+                wdt_resources[0].start = 0x49016000; /* WDT2 */
+        else if (cpu_is_omap343x())
+                wdt_resources[0].start = 0x48314000; /* WDT2 */
+        else
+                return;
+
+        wdt_resources[0].end = wdt_resources[0].start + 0x4f;
+
         (void) platform_device_register(&omap_wdt_device);
 }
 #else