[PATCH v1 2/4] watchdog: ulp_wdog: Update watchdog driver for imx93

[Stefan Roese]

On 09.10.22 10:00, Alice Guo (OSS) wrote:
> From: Alice Guo <alice.guo at nxp.com>
> 
> 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 at nxp.com>
> ---
>   drivers/watchdog/ulp_wdog.c | 12 +++++++++++-
>   1 file changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/watchdog/ulp_wdog.c b/drivers/watchdog/ulp_wdog.c
> index c40e785d0a..843f95aa4f 100644
> --- a/drivers/watchdog/ulp_wdog.c
> +++ b/drivers/watchdog/ulp_wdog.c
> @@ -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 */
> +#if defined(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);
> +#endif

Could you please change from using #ifdef to if (IS_ENABLED)?

	if (IS_ENABLED(CONFIG_ARCH_IMX9)) {
	...

>   
>   	/* Wait WDOG reconfiguration */
>   	while (!(readl(&wdog->cs) & WDGCS_RCS))
> @@ -117,11 +123,15 @@ 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 */
> +#if defined(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);
> +#endif

Here as well please.

Thanks,
Stefan