]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
watchdog: ulp_wdog: Update watchdog driver for imx93
authorAlice Guo <alice.guo@nxp.com>
Fri, 21 Oct 2022 08:41:16 +0000 (16:41 +0800)
committerStefan Roese <sr@denx.de>
Mon, 24 Oct 2022 09:10:21 +0000 (11:10 +0200)
The WDOG clocks are sourced from the fixed 32KHz (lpo_clk).When the
timeout period exceeds 2 seconds, the value written to the TOVAL
register is larger than 16-bit can represent. Enabling watchdog
prescaler to solve this problem.

Signed-off-by: Alice Guo <alice.guo@nxp.com>
Reviewed-by: Stefan Roese <sr@denx.de>
drivers/watchdog/ulp_wdog.c

index 820da0f9dd9218712714a32bc88cbf0cfe6a9f84..17778587eea64b6e7090d89254d660ebd8aacf08 100644 (file)
@@ -36,6 +36,7 @@ struct wdog_regs {
 
 #define WDGCS_RCS                       BIT(10)
 #define WDGCS_ULK                       BIT(11)
+#define WDOG_CS_PRES                    BIT(12)
 #define WDGCS_CMD32EN                   BIT(13)
 #define WDGCS_FLG                       BIT(14)
 
@@ -89,7 +90,12 @@ void hw_watchdog_init(void)
        writel(0, &wdog->win);
 
        /* setting 1-kHz clock source, enable counter running, and clear interrupt */
-       writel((cmd32 | WDGCS_WDGE | WDGCS_WDGUPDATE | (WDG_LPO_CLK << 8) | WDGCS_FLG), &wdog->cs);
+       if (IS_ENABLED(CONFIG_ARCH_IMX9))
+               writel((cmd32 | WDGCS_WDGE | WDGCS_WDGUPDATE | (WDG_LPO_CLK << 8) |
+                      WDGCS_FLG | WDOG_CS_PRES), &wdog->cs);
+       else
+               writel((cmd32 | WDGCS_WDGE | WDGCS_WDGUPDATE | (WDG_LPO_CLK << 8) |
+                      WDGCS_FLG), &wdog->cs);
 
        /* Wait WDOG reconfiguration */
        while (!(readl(&wdog->cs) & WDGCS_RCS))
@@ -117,11 +123,14 @@ void reset_cpu(void)
        while (!(readl(&wdog->cs) & WDGCS_ULK))
                ;
 
-       hw_watchdog_set_timeout(5); /* 5ms timeout */
+       hw_watchdog_set_timeout(5); /* 5ms timeout for general; 40ms timeout for imx93 */
        writel(0, &wdog->win);
 
        /* enable counter running */
-       writel((cmd32 | WDGCS_WDGE | (WDG_LPO_CLK << 8)), &wdog->cs);
+       if (IS_ENABLED(CONFIG_ARCH_IMX9))
+               writel((cmd32 | WDGCS_WDGE | (WDG_LPO_CLK << 8) | WDOG_CS_PRES), &wdog->cs);
+       else
+               writel((cmd32 | WDGCS_WDGE | (WDG_LPO_CLK << 8)), &wdog->cs);
 
        /* Wait WDOG reconfiguration */
        while (!(readl(&wdog->cs) & WDGCS_RCS))