Commit f31909c0 authored by Stefan Roese's avatar Stefan Roese Committed by Paul Mackerras
Browse files

[POWERPC] ppc: Fix booke watchdog initialization



Fix two problems in the book-e watchdog driver.

a) The 4xx default period was defined wrong
b) Clear status before enabling the watchdog exception
Signed-off-by: default avatarStefan Roese <sr@denx.de>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 2366fb16
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#ifdef CONFIG_FSL_BOOKE #ifdef CONFIG_FSL_BOOKE
#define WDT_PERIOD_DEFAULT 63 /* Ex. wdt_period=28 bus=333Mhz , reset=~40sec */ #define WDT_PERIOD_DEFAULT 63 /* Ex. wdt_period=28 bus=333Mhz , reset=~40sec */
#else #else
#define WDT_PERIOD_DEFAULT 4 /* Refer to the PPC40x and PPC4xx manuals */ #define WDT_PERIOD_DEFAULT 3 /* Refer to the PPC40x and PPC4xx manuals */
#endif /* for timing information */ #endif /* for timing information */
u32 booke_wdt_enabled = 0; u32 booke_wdt_enabled = 0;
...@@ -47,6 +47,14 @@ u32 booke_wdt_period = WDT_PERIOD_DEFAULT; ...@@ -47,6 +47,14 @@ u32 booke_wdt_period = WDT_PERIOD_DEFAULT;
#define WDTP(x) (TCR_WP(x)) #define WDTP(x) (TCR_WP(x))
#endif #endif
/*
* booke_wdt_ping:
*/
static __inline__ void booke_wdt_ping(void)
{
mtspr(SPRN_TSR, TSR_ENW|TSR_WIS);
}
/* /*
* booke_wdt_enable: * booke_wdt_enable:
*/ */
...@@ -54,20 +62,14 @@ static __inline__ void booke_wdt_enable(void) ...@@ -54,20 +62,14 @@ static __inline__ void booke_wdt_enable(void)
{ {
u32 val; u32 val;
/* clear status before enabling watchdog */
booke_wdt_ping();
val = mfspr(SPRN_TCR); val = mfspr(SPRN_TCR);
val |= (TCR_WIE|TCR_WRC(WRC_CHIP)|WDTP(booke_wdt_period)); val |= (TCR_WIE|TCR_WRC(WRC_CHIP)|WDTP(booke_wdt_period));
mtspr(SPRN_TCR, val); mtspr(SPRN_TCR, val);
} }
/*
* booke_wdt_ping:
*/
static __inline__ void booke_wdt_ping(void)
{
mtspr(SPRN_TSR, TSR_ENW|TSR_WIS);
}
/* /*
* booke_wdt_write: * booke_wdt_write:
*/ */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment