diff mbox series

[V2,16/16] imx: toradex/verdin-imx8mm/p: cleanup board watchdog code

Message ID 20220505110613.31314-17-peng.fan@oss.nxp.com
State Accepted
Commit 8494fe077c863ef0514ba8de579809d37267f54e
Delegated to: Stefano Babic
Headers show
Series imx: imx8m: clean up wdog code | expand

Commit Message

Peng Fan (OSS) May 5, 2022, 11:06 a.m. UTC 
From: Peng Fan <peng.fan@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@nxp.com>
---
 board/toradex/verdin-imx8mm/spl.c | 11 -----------
 1 file changed, 11 deletions(-)

Comments

Stefano Babic May 20, 2022, 1:41 p.m. UTC | #1 
> From: Peng Fan <peng.fan@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@nxp.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic
diff mbox series

Patch

diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c
index 1f3f38351ef..1f643129d98 100644
--- a/board/toradex/verdin-imx8mm/spl.c
+++ b/board/toradex/verdin-imx8mm/spl.c
@@ -75,7 +75,6 @@  int board_fit_config_name_match(const char *name)
 #endif
 
 #define UART_PAD_CTRL	(PAD_CTL_PUE | PAD_CTL_PE | PAD_CTL_DSE4)
-#define WDOG_PAD_CTRL	(PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE)
 
 /* Verdin UART_3, Console/Debug UART */
 static iomux_v3_cfg_t const uart_pads[] = {
@@ -83,20 +82,10 @@  static iomux_v3_cfg_t const uart_pads[] = {
 	IMX8MM_PAD_SAI2_RXC_UART1_RX | MUX_PAD_CTRL(UART_PAD_CTRL),
 };
 
-static iomux_v3_cfg_t const wdog_pads[] = {
-	IMX8MM_PAD_GPIO1_IO02_WDOG1_WDOG_B  | MUX_PAD_CTRL(WDOG_PAD_CTRL),
-};
-
 __weak void board_early_init(void)
 {
-	struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR;
-
 	init_uart_clk(0);
 
-	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));
 }