watchdog: sama5d4: fix WDD value to be always set to max
Subsystems (2)
PATCH RESEND 1/1 watchdog: sama5d4: fix WDD value to be always set to max
From: Eugen Hristev <[email protected]>
WDD value must be always set to max (0xFFF) otherwise the hardware block will reset the board on the first ping of the watchdog.
Reviewed-by Guenter Roeck <[email protected]>
Signed-off-by Eugen Hristev <[email protected]>
--- drivers/watchdog/sama5d4_wdt.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/watchdog/sama5d4_wdt.c +1 -3
@@ -110,9 +110,7 @@ static int sama5d4_wdt_set_timeout(struct watchdog_device *wdd,u32 value =WDT_SEC2TICKS (timeout); wdt->mr &= ~AT91_WDT_WDV ; - wdt->mr &= ~AT91_WDT_WDD ; wdt->mr |=AT91_WDT_SET_WDV (value); - wdt->mr |=AT91_WDT_SET_WDD (value);/* * WDDIS has to be 0 when updating WDD/WDV. The datasheet states: When
@@ -248,7 +246,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev) timeout =WDT_SEC2TICKS (wdd->timeout); - wdt->mr |=AT91_WDT_SET_WDD (timeout); + wdt->mr |=AT91_WDT_SET_WDD (WDT_SEC2TICKS (MAX_WDT_TIMEOUT )); wdt->mr |=AT91_WDT_SET_WDV (timeout); ret =sama5d4_wdt_init (wdt);
Signature · 1 line
2.7.4
Guenter Roeck
maintainerQuoted 7 lines · On 7/9/19 12:26 AM, [email protected] wrote:
From: Eugen Hristev <[email protected]>
WDD value must be always set to max (
0xFFF) otherwise the hardware block will reset the board on the first ping of the watchdog.Reviewed-by Guenter Roeck <[email protected]>Signed-off-by Eugen Hristev <[email protected]>
This patch is already in -next as of today.
Guenter
Quoted 28 lines
--- drivers/watchdog/sama5d4_wdt.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)drivers/watchdog/sama5d4_wdt.c +1
-3@@ -110,9 +110,7 @@ static int sama5d4_wdt_set_timeout(struct watchdog_device *wdd,u32 value =WDT_SEC2TICKS (timeout); wdt->mr &= ~AT91_WDT_WDV ; - wdt->mr &= ~AT91_WDT_WDD ; wdt->mr |=AT91_WDT_SET_WDV (value); - wdt->mr |=AT91_WDT_SET_WDD (value);/* * WDDIS has to be 0 when updating WDD/WDV. The datasheet states: When @@ -248,7 +246,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev) timeout =WDT_SEC2TICKS (wdd->timeout); - wdt->mr |=AT91_WDT_SET_WDD (timeout); + wdt->mr |=AT91_WDT_SET_WDD (WDT_SEC2TICKS (MAX_WDT_TIMEOUT )); wdt->mr |=AT91_WDT_SET_WDV (timeout); ret =sama5d4_wdt_init (wdt);