From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
To: Stefano Babic <sbabic@denx.de>,
Fabio Estevam <festevam@gmail.com>,
"NXP i.MX U-Boot Team" <uboot-imx@nxp.com>
Cc: u-boot@lists.denx.de, Peng Fan <peng.fan@nxp.com>
Subject: [PATCH 12/12] imx: imx93-11x11-evk: drop duplicated nodes
Date: Sat, 04 Jan 2025 12:25:46 +0800 [thread overview]
Message-ID: <20250104-imx-bootstd-v1-12-e09618cc1d65@nxp.com> (raw)
In-Reply-To: <20250104-imx-bootstd-v1-0-e09618cc1d65@nxp.com>
From: Peng Fan <peng.fan@nxp.com>
The upstream dts already has the lpi2c2 subnodes, so drop the duplicated
ones in u-boot dtsi.
Since the adp5585 compatible string changes, update the driver
compatible string. i.MX93 11x11 EVK is the only user of the driver as
of now, so it is safe to drop legacy compatible string.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
arch/arm/dts/imx93-11x11-evk-u-boot.dtsi | 118 -------------------------------
drivers/gpio/adp5585_gpio.c | 2 +-
2 files changed, 1 insertion(+), 119 deletions(-)
diff --git a/arch/arm/dts/imx93-11x11-evk-u-boot.dtsi b/arch/arm/dts/imx93-11x11-evk-u-boot.dtsi
index 408e601bc90eb69744ce1198498e01b12f814ca9..a99ba99bfb4f2c08752472536f2450c8e79fb87e 100644
--- a/arch/arm/dts/imx93-11x11-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx93-11x11-evk-u-boot.dtsi
@@ -26,111 +26,6 @@
bootph-pre-ram;
};
-&lpi2c2 {
- #address-cells = <1>;
- #size-cells = <0>;
- clock-frequency = <400000>;
- pinctrl-names = "default", "sleep";
- pinctrl-0 = <&pinctrl_lpi2c2>;
- pinctrl-1 = <&pinctrl_lpi2c2>;
- status = "okay";
-
- pmic@25 {
- compatible = "nxp,pca9451a";
- reg = <0x25>;
- interrupt-parent = <&pcal6524>;
- interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
-
- regulators {
- buck1: BUCK1 {
- regulator-name = "BUCK1";
- regulator-min-microvolt = <650000>;
- regulator-max-microvolt = <2237500>;
- regulator-boot-on;
- regulator-always-on;
- regulator-ramp-delay = <3125>;
- };
-
- buck2: BUCK2 {
- regulator-name = "BUCK2";
- regulator-min-microvolt = <600000>;
- regulator-max-microvolt = <2187500>;
- regulator-boot-on;
- regulator-always-on;
- regulator-ramp-delay = <3125>;
- };
-
- buck4: BUCK4{
- regulator-name = "BUCK4";
- regulator-min-microvolt = <600000>;
- regulator-max-microvolt = <3400000>;
- regulator-boot-on;
- regulator-always-on;
- };
-
- buck5: BUCK5{
- regulator-name = "BUCK5";
- regulator-min-microvolt = <600000>;
- regulator-max-microvolt = <3400000>;
- regulator-boot-on;
- regulator-always-on;
- };
-
- buck6: BUCK6 {
- regulator-name = "BUCK6";
- regulator-min-microvolt = <600000>;
- regulator-max-microvolt = <3400000>;
- regulator-boot-on;
- regulator-always-on;
- };
-
- ldo1: LDO1 {
- regulator-name = "LDO1";
- regulator-min-microvolt = <1600000>;
- regulator-max-microvolt = <3300000>;
- regulator-boot-on;
- regulator-always-on;
- };
-
- ldo4: LDO4 {
- regulator-name = "LDO4";
- regulator-min-microvolt = <800000>;
- regulator-max-microvolt = <3300000>;
- regulator-boot-on;
- regulator-always-on;
- };
-
- ldo5: LDO5 {
- regulator-name = "LDO5";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <3300000>;
- regulator-boot-on;
- regulator-always-on;
- };
- };
- };
-
- pcal6524: gpio@22 {
- compatible = "nxp,pcal6524";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_pcal6524>;
- reg = <0x22>;
- gpio-controller;
- #gpio-cells = <2>;
- interrupt-controller;
- #interrupt-cells = <2>;
- interrupt-parent = <&gpio3>;
- interrupts = <27 IRQ_TYPE_LEVEL_LOW>;
- };
-
- adp5585gpio: gpio@34 {
- compatible = "adp5585";
- reg = <0x34>;
- gpio-controller;
- #gpio-cells = <2>;
- };
-};
-
&aips1 {
bootph-pre-ram;
bootph-all;
@@ -149,19 +44,6 @@
&iomuxc {
bootph-pre-ram;
bootph-some-ram;
-
- pinctrl_lpi2c2: lpi2c2grp {
- fsl,pins = <
- MX93_PAD_I2C2_SCL__LPI2C2_SCL 0x40000b9e
- MX93_PAD_I2C2_SDA__LPI2C2_SDA 0x40000b9e
- >;
- };
-
- pinctrl_pcal6524: pcal6524grp {
- fsl,pins = <
- MX93_PAD_CCM_CLKO2__GPIO3_IO27 0x31e
- >;
- };
};
®_usdhc2_vmmc {
diff --git a/drivers/gpio/adp5585_gpio.c b/drivers/gpio/adp5585_gpio.c
index ea0cb75459b741c0157aa9077c44163b3c0cab01..114583b3c3bd9a51fbe1960b7532150d0d7cabdd 100644
--- a/drivers/gpio/adp5585_gpio.c
+++ b/drivers/gpio/adp5585_gpio.c
@@ -224,7 +224,7 @@ static int adp5585_probe(struct udevice *dev)
}
static const struct udevice_id adp5585_ids[] = {
- { .compatible = "adp5585" },
+ { .compatible = "adi,adp5585" },
{ }
};
--
2.35.3
next prev parent reply other threads:[~2025-01-04 3:21 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-04 4:25 [PATCH 00/12] imx9: switch to bootstd for i.MX93/1 EVK/QSB and i.MX8M EVK Peng Fan (OSS)
2025-01-04 4:25 ` [PATCH 01/12] imx: imx93_evk: switch to BOOTSTD Peng Fan (OSS)
2025-01-06 11:06 ` Fabio Estevam
2025-01-04 4:25 ` [PATCH 02/12] imx: imx93_qsb: " Peng Fan (OSS)
2025-01-04 4:25 ` [PATCH 03/12] imx: imx91_evk: " Peng Fan (OSS)
2025-01-04 4:25 ` [PATCH 04/12] imx: imx8mp_evk: Enable dynamic settings to mmcdev and mmcroot Peng Fan (OSS)
2025-01-04 4:25 ` [PATCH 05/12] imx: imx8mp_evk: Switch to BOOTSTD Peng Fan (OSS)
2025-01-04 4:25 ` [PATCH 06/12] imx: imx8mn_evk: Enable dynamic settings to mmcdev and mmcroot Peng Fan (OSS)
2025-01-06 11:09 ` Fabio Estevam
2025-01-04 4:25 ` [PATCH 07/12] imx: imx8mn_evk: Switch to BOOTSTD Peng Fan (OSS)
2025-01-04 4:25 ` [PATCH 08/12] imx: imx8mm_evk: Enable dynamic settings to mmcdev and mmcroot Peng Fan (OSS)
2025-01-04 4:25 ` [PATCH 09/12] imx: imx8mm_evk: Switch to BOOTSTD Peng Fan (OSS)
2025-01-04 4:25 ` [PATCH 10/12] imx: imx8mq_evk: Enable dynamic settings to mmcdev and mmcroot Peng Fan (OSS)
2025-01-06 11:11 ` Fabio Estevam
2025-01-04 4:25 ` [PATCH 11/12] imx: imx8mq_evk: Switch to BOOTSTD Peng Fan (OSS)
2025-01-04 4:25 ` Peng Fan (OSS) [this message]
2025-01-04 19:30 ` [PATCH 00/12] imx9: switch to bootstd for i.MX93/1 EVK/QSB and i.MX8M EVK Simon Glass
2025-01-06 1:33 ` Peng Fan
2025-01-06 1:02 ` Simon Glass
2025-01-06 1:14 ` Peng Fan
2025-01-06 12:15 ` Simon Glass
2025-01-06 23:45 ` Tony Dinh
2025-01-13 9:48 ` Frieder Schrempf
2025-01-14 13:13 ` Simon Glass
2025-01-07 1:39 ` Peng Fan
2025-01-08 16:27 ` Simon Glass
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=20250104-imx-bootstd-v1-12-e09618cc1d65@nxp.com \
--to=peng.fan@oss.nxp.com \
--cc=festevam@gmail.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox