[PATCH V2 15/16] imx: verdin-imx8mm/p: cleanup board watchdog code

Marcel Ziswiler marcel.ziswiler at toradex.com
Tue May 17 00:24:35 CEST 2022


Hi Peng

On Thu, 2022-05-05 at 19:06 +0800, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan at nxp.com>
> 
> pinctrl_wdog already marked u-boot,dm-spl, so clean up board code.
> 
> The set_wdog_reset() function is not necessary as this is handled by
> the imx_watchdog.c driver due to the 'fsl,ext-reset-output' property
> being set.
> 
> Signed-off-by: Peng Fan <peng.fan at nxp.com>
> ---
>  board/toradex/verdin-imx8mp/verdin-imx8mp.c | 11 -----------
>  1 file changed, 11 deletions(-)
> 
> diff --git a/board/toradex/verdin-imx8mp/verdin-imx8mp.c b/board/toradex/verdin-imx8mp/verdin-imx8mp.c
> index 8334c9bb376..e3c1a1201da 100644
> --- a/board/toradex/verdin-imx8mp/verdin-imx8mp.c
> +++ b/board/toradex/verdin-imx8mp/verdin-imx8mp.c
> @@ -24,7 +24,6 @@
>  DECLARE_GLOBAL_DATA_PTR;
>  
>  #define UART_PAD_CTRL  (PAD_CTL_DSE6 | PAD_CTL_FSEL1)
> -#define WDOG_PAD_CTRL  (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE)
>  
>  /* Verdin UART_3, Console/Debug UART */
>  static const iomux_v3_cfg_t uart_pads[] = {
> @@ -32,18 +31,8 @@ static const iomux_v3_cfg_t uart_pads[] = {
>         MX8MP_PAD_UART3_TXD__UART3_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL),
>  };
>  
> -static const iomux_v3_cfg_t wdog_pads[] = {
> -       MX8MP_PAD_GPIO1_IO02__WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL),
> -};
> -
>  int board_early_init_f(void)
>  {
> -       struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR;
> -
> -       imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads));
> -
> -       set_wdog_reset(wdog);
> -
>         imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads));
>  
>         init_uart_clk(2);

Unfortunately, this one won't apply anymore after the following hot-fix [1] and will require re-basing.

Sorry about that.

[1] https://patchwork.ozlabs.org/project/uboot/patch/20220516222145.959359-1-marcel@ziswiler.com/

Cheers

Marcel


More information about the U-Boot mailing list