All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
To: sbabic@denx.de, festevam@gmail.com,
	"NXP i.MX U-Boot Team" <uboot-imx@nxp.com>,
	"Ying-Chun Liu (PaulLiu)" <paul.liu@linaro.org>
Cc: u-boot@lists.denx.de, Peng Fan <peng.fan@nxp.com>
Subject: [PATCH V2 12/16] imx: imx8mp_rsb7320a1: enable wdog driver model in SPL
Date: Thu,  5 May 2022 19:06:08 +0800	[thread overview]
Message-ID: <20220505110613.31314-13-peng.fan@oss.nxp.com> (raw)
In-Reply-To: <20220505110613.31314-1-peng.fan@oss.nxp.com>

From: Peng Fan <peng.fan@nxp.com>

Mark wdog1/pinctrl_wdog as u-boot,dm-spl to 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>
---
 arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi          |  8 ++++++++
 board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c | 12 ------------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi b/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi
index 2848b24f655..4419967ee42 100644
--- a/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi
@@ -89,6 +89,14 @@
 	u-boot,dm-spl;
 };
 
+&wdog1 {
+	u-boot,dm-spl;
+};
+
+&pinctrl_wdog {
+	u-boot,dm-spl;
+};
+
 &pinctrl_i2c1 {
 	u-boot,dm-spl;
 };
diff --git a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c
index f129ebd429b..0a1b2c94161 100644
--- a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c
+++ b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c
@@ -28,12 +28,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define WDOG_PAD_CTRL	(PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE)
-
-static const iomux_v3_cfg_t wdog_pads[] = {
-	MX8MP_PAD_GPIO1_IO02__WDOG1_WDOG_B  | MUX_PAD_CTRL(WDOG_PAD_CTRL),
-};
-
 #ifdef CONFIG_NAND_MXS
 static void setup_gpmi_nand(void)
 {
@@ -69,12 +63,6 @@ u8 num_image_type_guids = ARRAY_SIZE(fw_images);
 
 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);
-
 	init_uart_clk(2);
 
 	return 0;
-- 
2.36.0


  parent reply	other threads:[~2022-05-05 10:27 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-05 11:05 [PATCH V2 00/16] imx: imx8m: clean up wdog code Peng Fan (OSS)
2022-05-05 11:05 ` [PATCH V2 01/16] imx: imx8mn_evk: enable pinctrl_wdog in SPL Peng Fan (OSS)
2022-05-20 13:40   ` sbabic
2022-05-05 11:05 ` [PATCH V2 02/16] imx: imx8mm_evk: " Peng Fan (OSS)
2022-05-20 13:41   ` sbabic
2022-05-05 11:05 ` [PATCH V2 03/16] imx: imx8mp_evk: " Peng Fan (OSS)
2022-05-20 13:42   ` sbabic
2022-05-05 11:06 ` [PATCH V2 04/16] imx: imx8mm_beacon: " Peng Fan (OSS)
2022-05-05 11:06 ` [PATCH V2 05/16] imx: imx8mm-cl-iot-gate: " Peng Fan (OSS)
2022-05-05 11:06 ` [PATCH V2 06/16] imx: engicam-imx8mm: drop unused macro Peng Fan (OSS)
2022-05-05 11:06 ` [PATCH V2 07/16] imx: imx8mm-mx8menlo: drop unneeded watchdog settings Peng Fan (OSS)
2022-05-05 12:23   ` Marek Vasut
2022-05-20 13:41   ` sbabic
2022-05-05 11:06 ` [PATCH V2 08/16] imx: imx8mm/n/p-venice: enable pinctrl_wdog in SPL Peng Fan (OSS)
2022-05-05 11:06 ` [PATCH V2 09/16] imx: imx8mn-beacon: " Peng Fan (OSS)
2022-05-05 11:06 ` [PATCH V2 10/16] imx: imx8mn_smm_s2: clean up board watchdog code Peng Fan (OSS)
2022-05-20 13:41   ` sbabic
2022-05-05 11:06 ` [PATCH V2 11/16] imx: imx8mn_var_som: " Peng Fan (OSS)
2022-05-05 11:06 ` Peng Fan (OSS) [this message]
2022-05-05 11:06 ` [PATCH V2 13/16] imx: imx8mn-kontron-n801x: enable pinctrl_wdog in SPL Peng Fan (OSS)
2022-05-05 11:06 ` [PATCH V2 14/16] imx: phycore_imx8mm/p: clean up board watchdog code Peng Fan (OSS)
2022-05-05 11:06 ` [PATCH V2 15/16] imx: verdin-imx8mm/p: cleanup " Peng Fan (OSS)
2022-05-16 22:24   ` Marcel Ziswiler
2022-05-20 13:43   ` sbabic
2022-05-05 11:06 ` [PATCH V2 16/16] imx: toradex/verdin-imx8mm/p: " Peng Fan (OSS)
2022-05-20 13:41   ` sbabic

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220505110613.31314-13-peng.fan@oss.nxp.com \
    --to=peng.fan@oss.nxp.com \
    --cc=festevam@gmail.com \
    --cc=paul.liu@linaro.org \
    --cc=peng.fan@nxp.com \
    --cc=sbabic@denx.de \
    --cc=u-boot@lists.denx.de \
    --cc=uboot-imx@nxp.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.