watchdog: mpc8xxx: Add support for mpc83xx

Introduce a new compatible "fsl,pq2pro-wdt"
On mpc83xx, the prescaling factor is 0x10000.

Don't write the watchdog configuration register in
start.S as it can be written only once.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>

diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c
index a6c063556e8360ba85bd1fe604c15d9316e3f49d..f6ffe295b8ed8fee526493a34606c823208e317e 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/cpu.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu.c
@@ -165,7 +165,7 @@ unsigned long get_tbclk(void)
 }
 #endif
 
-#if defined(CONFIG_WATCHDOG)
+#if defined(CONFIG_WATCHDOG) && !defined(CONFIG_WDT)
 void watchdog_reset (void)
 {
        int re_enable = disable_interrupts();

diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S
index e3878e431fbe2deb5d1efd344c19c7d2374b511a..4329b173dbb420f30614a50f56d4edf6d6158bd9 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/start.S
+++ b/arch/powerpc/cpu/mpc83xx/start.S
@@ -483,6 +483,7 @@ init_e300_core: /* time t 10 */
 
 
        lis     r3, CONFIG_SYS_IMMR@h
+#ifndef CONFIG_WDT_MPC8xxx
 #if defined(CONFIG_WATCHDOG)
        /* Initialise the Watchdog values and reset it (if req) */
        /*------------------------------------------------------*/
@@ -508,6 +509,7 @@ init_e300_core: /* time t 10 */
        stw r4, SWCRR(r3)
 1:
 #endif /* CONFIG_WATCHDOG */
+#endif
 
 #if defined(CONFIG_MASK_AER_AO)
        /* Write the Arbiter Event Enable to mask Address Only traps. */

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index f7fbb28d80af63e1dee5269cc2bb7b86e5498e2a..f7767596e16263297cf039a43721efa7ad0a630a 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -186,7 +186,7 @@ config WDT_MESON_GXBB
 
 config WDT_MPC8xxx
        bool "MPC8xxx watchdog timer support"
-       depends on WDT && MPC8xx
+       depends on WDT && (MPC8xx || MPC83xx)
        help
          Select this to enable mpc8xxx watchdog timer
 

diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c
index 9a29938faceef13862b82295d6f579c3fbcf87a0..f28636ca901550b76ea0df48e39c90b4e72dff42 100644 (file)
--- a/drivers/watchdog/mpc8xxx_wdt.c
+++ b/drivers/watchdog/mpc8xxx_wdt.c
@@ -98,6 +98,7 @@ static const struct wdt_ops mpc8xxx_wdt_ops = {
 
 static const struct udevice_id mpc8xxx_wdt_ids[] = {
        { .compatible = "fsl,pq1-wdt", .data = 0x800 },
+       { .compatible = "fsl,pq2pro-wdt", .data = 0x10000 },
        {}
 };