[PATCH]Watchdog: Fix for the watchdog reset issue on OMAP3

[PATCH]Watchdog: Fix for the watchdog reset issue on OMAP3

[Reddy, Teerth]

Hi,

This patch fixes the watchdog reset issue for OMAP3. OMAP_WATCHDOG_BASE is being added twice so this patch resolves the issue and the watchdog works fine.

Regards,
Teerth


Fix for the watchdog reset defect.The watchdog header file has been modified in the mainline merge due to which the watchdog was not functioning.
OMAP_WATCHDOG_BASE is being added twice so this patch is required for the watchdog to function.

Signed-off-by: Teerth Reddy <teerth@ti.com>
---

Index: linux/drivers/watchdog/omap_wdt.h ===================================================================
--- linux-omap-git-20071030/drivers/watchdog/omap_wdt.h	2007-11-14 05:51:05.830299544 -0500
+++ linux-omap-2.6-25thOct/drivers/char/watchdog/omap_wdt.h	2007-11-13 09:30:33.772264576 -0500
@@ -30,25 +30,15 @@
 #ifndef _OMAP_WATCHDOG_H
 #define _OMAP_WATCHDOG_H
 
-#define OMAP1610_WATCHDOG_BASE		0xfffeb000
-#define OMAP2420_WATCHDOG_BASE		0x48022000	/*WDT Timer 2 */
-
-#ifdef CONFIG_ARCH_OMAP24XX
-#define OMAP_WATCHDOG_BASE 		OMAP2420_WATCHDOG_BASE
-#else
-#define OMAP_WATCHDOG_BASE 		OMAP1610_WATCHDOG_BASE
-#define RM_RSTST_WKUP			0
-#endif
-
-#define OMAP_WATCHDOG_REV		(OMAP_WATCHDOG_BASE + 0x00)
-#define OMAP_WATCHDOG_SYS_CONFIG	(OMAP_WATCHDOG_BASE + 0x10)
-#define OMAP_WATCHDOG_STATUS		(OMAP_WATCHDOG_BASE + 0x14)
-#define OMAP_WATCHDOG_CNTRL		(OMAP_WATCHDOG_BASE + 0x24)
-#define OMAP_WATCHDOG_CRR		(OMAP_WATCHDOG_BASE + 0x28)
-#define OMAP_WATCHDOG_LDR		(OMAP_WATCHDOG_BASE + 0x2c)
-#define OMAP_WATCHDOG_TGR		(OMAP_WATCHDOG_BASE + 0x30)
-#define OMAP_WATCHDOG_WPS		(OMAP_WATCHDOG_BASE + 0x34)
-#define OMAP_WATCHDOG_SPR		(OMAP_WATCHDOG_BASE + 0x48)
+#define OMAP_WATCHDOG_REV		(0x00)
+#define OMAP_WATCHDOG_SYS_CONFIG	(0x10)
+#define OMAP_WATCHDOG_STATUS		(0x14)
+#define OMAP_WATCHDOG_CNTRL		(0x24)
+#define OMAP_WATCHDOG_CRR		(0x28)
+#define OMAP_WATCHDOG_LDR		(0x2c)
+#define OMAP_WATCHDOG_TGR		(0x30)
+#define OMAP_WATCHDOG_WPS		(0x34)
+#define OMAP_WATCHDOG_SPR		(0x48)
 
 /* Using the prescaler, the OMAP watchdog could go for many
  * months before firing.  These limits work without scaling,

Re: [PATCH]Watchdog: Fix for the watchdog reset issue on OMAP3

[Tony Lindgren]

* Reddy, Teerth <teerth@ti.com> [071116 04:53]:
> Hi,
> 
> This patch fixes the watchdog reset issue for OMAP3. OMAP_WATCHDOG_BASE is being added twice so this patch resolves the issue and the watchdog works fine.
> 
> Regards,
> Teerth
> 
> 
> Fix for the watchdog reset defect.The watchdog header file has been modified in the mainline merge due to which the watchdog was not functioning.
> OMAP_WATCHDOG_BASE is being added twice so this patch is required for the watchdog to function.
> 
> Signed-off-by: Teerth Reddy <teerth@ti.com>
> ---
> 
> Index: linux/drivers/watchdog/omap_wdt.h ===================================================================
> --- linux-omap-git-20071030/drivers/watchdog/omap_wdt.h	2007-11-14 05:51:05.830299544 -0500
> +++ linux-omap-2.6-25thOct/drivers/char/watchdog/omap_wdt.h	2007-11-13 09:30:33.772264576 -0500
> @@ -30,25 +30,15 @@
>  #ifndef _OMAP_WATCHDOG_H
>  #define _OMAP_WATCHDOG_H
>  
> -#define OMAP1610_WATCHDOG_BASE		0xfffeb000
> -#define OMAP2420_WATCHDOG_BASE		0x48022000	/*WDT Timer 2 */
> -
> -#ifdef CONFIG_ARCH_OMAP24XX
> -#define OMAP_WATCHDOG_BASE 		OMAP2420_WATCHDOG_BASE
> -#else
> -#define OMAP_WATCHDOG_BASE 		OMAP1610_WATCHDOG_BASE
> -#define RM_RSTST_WKUP			0
> -#endif
> -
> -#define OMAP_WATCHDOG_REV		(OMAP_WATCHDOG_BASE + 0x00)
> -#define OMAP_WATCHDOG_SYS_CONFIG	(OMAP_WATCHDOG_BASE + 0x10)
> -#define OMAP_WATCHDOG_STATUS		(OMAP_WATCHDOG_BASE + 0x14)
> -#define OMAP_WATCHDOG_CNTRL		(OMAP_WATCHDOG_BASE + 0x24)
> -#define OMAP_WATCHDOG_CRR		(OMAP_WATCHDOG_BASE + 0x28)
> -#define OMAP_WATCHDOG_LDR		(OMAP_WATCHDOG_BASE + 0x2c)
> -#define OMAP_WATCHDOG_TGR		(OMAP_WATCHDOG_BASE + 0x30)
> -#define OMAP_WATCHDOG_WPS		(OMAP_WATCHDOG_BASE + 0x34)
> -#define OMAP_WATCHDOG_SPR		(OMAP_WATCHDOG_BASE + 0x48)
> +#define OMAP_WATCHDOG_REV		(0x00)
> +#define OMAP_WATCHDOG_SYS_CONFIG	(0x10)
> +#define OMAP_WATCHDOG_STATUS		(0x14)
> +#define OMAP_WATCHDOG_CNTRL		(0x24)
> +#define OMAP_WATCHDOG_CRR		(0x28)
> +#define OMAP_WATCHDOG_LDR		(0x2c)
> +#define OMAP_WATCHDOG_TGR		(0x30)
> +#define OMAP_WATCHDOG_WPS		(0x34)
> +#define OMAP_WATCHDOG_SPR		(0x48)
>  
>  /* Using the prescaler, the OMAP watchdog could go for many
>   * months before firing.  These limits work without scaling,

Pushing today.

Tony