[PATCH v3 2/4] ARM: dts: Rename the TPS65217 regulator nodes
From: Eduard Bostina
Date: Tue Jul 21 2026 - 07:27:11 EST
The TPS65217 regulator nodes are named regulator@0 to regulator@6 and
rely on the deprecated 'regulator-compatible' property to be matched
against the driver, which looks for "dcdc1" to "ldo4".
Documentation/devicetree/bindings/regulator/tps65217.txt states the
regulators must be named dcdc[1-3] and ldo[1-4].
Rename the nodes accordingly and drop 'regulator-compatible' along with
the unit addresses it made necessary.
Signed-off-by: Eduard Bostina <egbostina@xxxxxxxxx>
---
.../boot/dts/ti/omap/am335x-bone-common.dtsi | 14 ++++-----
.../arm/boot/dts/ti/omap/am335x-chilisom.dtsi | 14 ++++-----
arch/arm/boot/dts/ti/omap/am335x-guardian.dts | 14 ++++-----
arch/arm/boot/dts/ti/omap/am335x-nano.dts | 14 ++++-----
.../dts/ti/omap/am335x-osd335x-common.dtsi | 14 ++++-----
arch/arm/boot/dts/ti/omap/am335x-pepper.dts | 14 ++++-----
arch/arm/boot/dts/ti/omap/am335x-shc.dts | 31 +++++--------------
arch/arm/boot/dts/ti/omap/am335x-sl50.dts | 14 ++++-----
arch/arm/boot/dts/tps65217.dtsi | 31 +++++--------------
9 files changed, 63 insertions(+), 97 deletions(-)
diff --git a/arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi b/arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi
index 1d83fc116b66..e5ca2bd65736 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi
@@ -337,12 +337,12 @@ pwrbutton {
};
regulators {
- dcdc1_reg: regulator@0 {
+ dcdc1_reg: dcdc1 {
regulator-name = "vdds_dpr";
regulator-always-on;
};
- dcdc2_reg: regulator@1 {
+ dcdc2_reg: dcdc2 {
/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
regulator-name = "vdd_mpu";
regulator-min-microvolt = <925000>;
@@ -351,7 +351,7 @@ dcdc2_reg: regulator@1 {
regulator-always-on;
};
- dcdc3_reg: regulator@2 {
+ dcdc3_reg: dcdc3 {
/* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
regulator-name = "vdd_core";
regulator-min-microvolt = <925000>;
@@ -360,22 +360,22 @@ dcdc3_reg: regulator@2 {
regulator-always-on;
};
- ldo1_reg: regulator@3 {
+ ldo1_reg: ldo1 {
regulator-name = "vio,vrtc,vdds";
regulator-always-on;
};
- ldo2_reg: regulator@4 {
+ ldo2_reg: ldo2 {
regulator-name = "vdd_3v3aux";
regulator-always-on;
};
- ldo3_reg: regulator@5 {
+ ldo3_reg: ldo3 {
regulator-name = "vdd_1v8";
regulator-always-on;
};
- ldo4_reg: regulator@6 {
+ ldo4_reg: ldo4 {
regulator-name = "vdd_3v3a";
regulator-always-on;
};
diff --git a/arch/arm/boot/dts/ti/omap/am335x-chilisom.dtsi b/arch/arm/boot/dts/ti/omap/am335x-chilisom.dtsi
index bd43da6356b6..9ee6d6d4a9c1 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-chilisom.dtsi
+++ b/arch/arm/boot/dts/ti/omap/am335x-chilisom.dtsi
@@ -70,12 +70,12 @@ tps: tps@24 {
&tps {
regulators {
- dcdc1_reg: regulator@0 {
+ dcdc1_reg: dcdc1 {
regulator-name = "vdds_dpr";
regulator-always-on;
};
- dcdc2_reg: regulator@1 {
+ dcdc2_reg: dcdc2 {
/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
regulator-name = "vdd_mpu";
regulator-min-microvolt = <925000>;
@@ -84,7 +84,7 @@ dcdc2_reg: regulator@1 {
regulator-always-on;
};
- dcdc3_reg: regulator@2 {
+ dcdc3_reg: dcdc3 {
/* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
regulator-name = "vdd_core";
regulator-min-microvolt = <925000>;
@@ -93,25 +93,25 @@ dcdc3_reg: regulator@2 {
regulator-always-on;
};
- ldo1_reg: regulator@3 {
+ ldo1_reg: ldo1 {
regulator-name = "vio,vrtc,vdds";
regulator-boot-on;
regulator-always-on;
};
- ldo2_reg: regulator@4 {
+ ldo2_reg: ldo2 {
regulator-name = "vdd_3v3aux";
regulator-boot-on;
regulator-always-on;
};
- ldo3_reg: regulator@5 {
+ ldo3_reg: ldo3 {
regulator-name = "vdd_1v8";
regulator-boot-on;
regulator-always-on;
};
- ldo4_reg: regulator@6 {
+ ldo4_reg: ldo4 {
regulator-name = "vdd_3v3d";
regulator-boot-on;
regulator-always-on;
diff --git a/arch/arm/boot/dts/ti/omap/am335x-guardian.dts b/arch/arm/boot/dts/ti/omap/am335x-guardian.dts
index d595e79d6b05..fecfe12e1349 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-guardian.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-guardian.dts
@@ -323,12 +323,12 @@ backlight {
};
regulators {
- dcdc1_reg: regulator@0 {
+ dcdc1_reg: dcdc1 {
regulator-name = "vdds_dpr";
regulator-always-on;
};
- dcdc2_reg: regulator@1 {
+ dcdc2_reg: dcdc2 {
/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
regulator-name = "vdd_mpu";
regulator-min-microvolt = <925000>;
@@ -337,7 +337,7 @@ dcdc2_reg: regulator@1 {
regulator-always-on;
};
- dcdc3_reg: regulator@2 {
+ dcdc3_reg: dcdc3 {
/* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
regulator-name = "vdd_core";
regulator-min-microvolt = <925000>;
@@ -346,24 +346,24 @@ dcdc3_reg: regulator@2 {
regulator-always-on;
};
- ldo1_reg: regulator@3 {
+ ldo1_reg: ldo1 {
regulator-name = "vio,vrtc,vdds";
regulator-always-on;
};
- ldo2_reg: regulator@4 {
+ ldo2_reg: ldo2 {
regulator-name = "vdd_3v3aux";
regulator-always-on;
};
- ldo3_reg: regulator@5 {
+ ldo3_reg: ldo3 {
regulator-name = "vdd_1v8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
};
- ldo4_reg: regulator@6 {
+ ldo4_reg: ldo4 {
regulator-name = "vdd_3v3a";
regulator-always-on;
};
diff --git a/arch/arm/boot/dts/ti/omap/am335x-nano.dts b/arch/arm/boot/dts/ti/omap/am335x-nano.dts
index d51cdd6e1ab4..c1143f0a3356 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-nano.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-nano.dts
@@ -431,7 +431,7 @@ &usb0 {
&tps {
regulators {
- dcdc1_reg: regulator@0 {
+ dcdc1_reg: dcdc1 {
/* +1.5V voltage with ±4% tolerance */
regulator-min-microvolt = <1450000>;
regulator-max-microvolt = <1550000>;
@@ -439,7 +439,7 @@ dcdc1_reg: regulator@0 {
regulator-always-on;
};
- dcdc2_reg: regulator@1 {
+ dcdc2_reg: dcdc2 {
/* VDD_MPU voltage limits 0.95V - 1.1V with ±4% tolerance */
regulator-name = "vdd_mpu";
regulator-min-microvolt = <915000>;
@@ -448,7 +448,7 @@ dcdc2_reg: regulator@1 {
regulator-always-on;
};
- dcdc3_reg: regulator@2 {
+ dcdc3_reg: dcdc3 {
/* VDD_CORE voltage limits 0.95V - 1.1V with ±4% tolerance */
regulator-name = "vdd_core";
regulator-min-microvolt = <915000>;
@@ -457,7 +457,7 @@ dcdc3_reg: regulator@2 {
regulator-always-on;
};
- ldo1_reg: regulator@3 {
+ ldo1_reg: ldo1 {
/* +1.8V voltage with ±4% tolerance */
regulator-min-microvolt = <1750000>;
regulator-max-microvolt = <1870000>;
@@ -465,7 +465,7 @@ ldo1_reg: regulator@3 {
regulator-always-on;
};
- ldo2_reg: regulator@4 {
+ ldo2_reg: ldo2 {
/* +3.3V voltage with ±4% tolerance */
regulator-min-microvolt = <3175000>;
regulator-max-microvolt = <3430000>;
@@ -473,7 +473,7 @@ ldo2_reg: regulator@4 {
regulator-always-on;
};
- ldo3_reg: regulator@5 {
+ ldo3_reg: ldo3 {
/* +1.8V voltage with ±4% tolerance */
regulator-min-microvolt = <1750000>;
regulator-max-microvolt = <1870000>;
@@ -481,7 +481,7 @@ ldo3_reg: regulator@5 {
regulator-always-on;
};
- ldo4_reg: regulator@6 {
+ ldo4_reg: ldo4 {
/* +3.3V voltage with ±4% tolerance */
regulator-min-microvolt = <3175000>;
regulator-max-microvolt = <3430000>;
diff --git a/arch/arm/boot/dts/ti/omap/am335x-osd335x-common.dtsi b/arch/arm/boot/dts/ti/omap/am335x-osd335x-common.dtsi
index 93a3af83feac..021cf5cbbb96 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-osd335x-common.dtsi
+++ b/arch/arm/boot/dts/ti/omap/am335x-osd335x-common.dtsi
@@ -69,12 +69,12 @@ pwrbutton {
};
regulators {
- dcdc1_reg: regulator@0 {
+ dcdc1_reg: dcdc1 {
regulator-name = "vdds_dpr";
regulator-always-on;
};
- dcdc2_reg: regulator@1 {
+ dcdc2_reg: dcdc2 {
/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
regulator-name = "vdd_mpu";
regulator-min-microvolt = <925000>;
@@ -83,7 +83,7 @@ dcdc2_reg: regulator@1 {
regulator-always-on;
};
- dcdc3_reg: regulator@2 {
+ dcdc3_reg: dcdc3 {
/* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
regulator-name = "vdd_core";
regulator-min-microvolt = <925000>;
@@ -92,24 +92,24 @@ dcdc3_reg: regulator@2 {
regulator-always-on;
};
- ldo1_reg: regulator@3 {
+ ldo1_reg: ldo1 {
regulator-name = "vio,vrtc,vdds";
regulator-always-on;
};
- ldo2_reg: regulator@4 {
+ ldo2_reg: ldo2 {
regulator-name = "vdd_3v3aux";
regulator-always-on;
};
- ldo3_reg: regulator@5 {
+ ldo3_reg: ldo3 {
regulator-name = "vdd_1v8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
};
- ldo4_reg: regulator@6 {
+ ldo4_reg: ldo4 {
regulator-name = "vdd_3v3a";
regulator-always-on;
};
diff --git a/arch/arm/boot/dts/ti/omap/am335x-pepper.dts b/arch/arm/boot/dts/ti/omap/am335x-pepper.dts
index 10d54e0ad15a..363638e74719 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-pepper.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-pepper.dts
@@ -433,12 +433,12 @@ backlight {
};
regulators {
- dcdc1_reg: regulator@0 {
+ dcdc1_reg: dcdc1 {
/* VDD_1V8 system supply */
regulator-always-on;
};
- dcdc2_reg: regulator@1 {
+ dcdc2_reg: dcdc2 {
/* VDD_CORE voltage limits 0.95V - 1.26V with +/-4% tolerance */
regulator-name = "vdd_core";
regulator-min-microvolt = <925000>;
@@ -447,7 +447,7 @@ dcdc2_reg: regulator@1 {
regulator-always-on;
};
- dcdc3_reg: regulator@2 {
+ dcdc3_reg: dcdc3 {
/* VDD_MPU voltage limits 0.95V - 1.1V with +/-4% tolerance */
regulator-name = "vdd_mpu";
regulator-min-microvolt = <925000>;
@@ -456,26 +456,26 @@ dcdc3_reg: regulator@2 {
regulator-always-on;
};
- ldo1_reg: regulator@3 {
+ ldo1_reg: ldo1 {
/* VRTC 1.8V always-on supply */
regulator-name = "vrtc,vdds";
regulator-always-on;
};
- ldo2_reg: regulator@4 {
+ ldo2_reg: ldo2 {
/* 3.3V rail */
regulator-name = "vdd_3v3aux";
regulator-always-on;
};
- ldo3_reg: regulator@5 {
+ ldo3_reg: ldo3 {
/* VDD_3V3A 3.3V rail */
regulator-name = "vdd_3v3a";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
- ldo4_reg: regulator@6 {
+ ldo4_reg: ldo4 {
/* VDD_3V3B 3.3V rail */
regulator-name = "vdd_3v3b";
regulator-always-on;
diff --git a/arch/arm/boot/dts/ti/omap/am335x-shc.dts b/arch/arm/boot/dts/ti/omap/am335x-shc.dts
index 597482822608..473058584691 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-shc.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-shc.dts
@@ -254,26 +254,19 @@ &tps {
ti,pmic-shutdown-controller;
regulators {
- #address-cells = <1>;
- #size-cells = <0>;
-
- dcdc1_reg: regulator@0 {
- reg = <0>;
+ dcdc1_reg: dcdc1 {
regulator-name = "vdds_dpr";
- regulator-compatible = "dcdc1";
regulator-min-microvolt = <1300000>;
regulator-max-microvolt = <1450000>;
regulator-boot-on;
regulator-always-on;
};
- dcdc2_reg: regulator@1 {
- reg = <1>;
+ dcdc2_reg: dcdc2 {
/*
* VDD_MPU voltage limits 0.95V - 1.26V with
* +/-4% tolerance
*/
- regulator-compatible = "dcdc2";
regulator-name = "vdd_mpu";
regulator-min-microvolt = <925000>;
regulator-max-microvolt = <1375000>;
@@ -282,51 +275,41 @@ dcdc2_reg: regulator@1 {
regulator-ramp-delay = <70000>;
};
- dcdc3_reg: regulator@2 {
- reg = <2>;
+ dcdc3_reg: dcdc3 {
/*
* VDD_CORE voltage limits 0.95V - 1.1V with
* +/-4% tolerance
*/
regulator-name = "vdd_core";
- regulator-compatible = "dcdc3";
regulator-min-microvolt = <925000>;
regulator-max-microvolt = <1125000>;
regulator-boot-on;
regulator-always-on;
};
- ldo1_reg: regulator@3 {
- reg = <3>;
+ ldo1_reg: ldo1 {
regulator-name = "vio,vrtc,vdds";
- regulator-compatible = "ldo1";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
};
- ldo2_reg: regulator@4 {
- reg = <4>;
+ ldo2_reg: ldo2 {
regulator-name = "vdd_3v3aux";
- regulator-compatible = "ldo2";
regulator-min-microvolt = <900000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
- ldo3_reg: regulator@5 {
- reg = <5>;
+ ldo3_reg: ldo3 {
regulator-name = "vdd_1v8";
- regulator-compatible = "ldo3";
regulator-min-microvolt = <900000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
};
- ldo4_reg: regulator@6 {
- reg = <6>;
+ ldo4_reg: ldo4 {
regulator-name = "vdd_3v3a";
- regulator-compatible = "ldo4";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
diff --git a/arch/arm/boot/dts/ti/omap/am335x-sl50.dts b/arch/arm/boot/dts/ti/omap/am335x-sl50.dts
index c5259eb7d21c..0cc9289c752b 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-sl50.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-sl50.dts
@@ -607,14 +607,14 @@ &tps {
interrupts = <7>; /* NNMI */
regulators {
- dcdc1_reg: regulator@0 {
+ dcdc1_reg: dcdc1 {
/* VDDS_DDR */
regulator-min-microvolt = <1500000>;
regulator-max-microvolt = <1500000>;
regulator-always-on;
};
- dcdc2_reg: regulator@1 {
+ dcdc2_reg: dcdc2 {
/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
regulator-name = "vdd_mpu";
regulator-min-microvolt = <925000>;
@@ -623,7 +623,7 @@ dcdc2_reg: regulator@1 {
regulator-always-on;
};
- dcdc3_reg: regulator@2 {
+ dcdc3_reg: dcdc3 {
/* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
regulator-name = "vdd_core";
regulator-min-microvolt = <925000>;
@@ -632,28 +632,28 @@ dcdc3_reg: regulator@2 {
regulator-always-on;
};
- ldo1_reg: regulator@3 {
+ ldo1_reg: ldo1 {
/* VRTC / VIO / VDDS*/
regulator-always-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
- ldo2_reg: regulator@4 {
+ ldo2_reg: ldo2 {
/* VDD_3V3AUX */
regulator-always-on;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
- ldo3_reg: regulator@5 {
+ ldo3_reg: ldo3 {
/* VDD_1V8 */
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
};
- ldo4_reg: regulator@6 {
+ ldo4_reg: ldo4 {
/* VDD_3V3A */
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
diff --git a/arch/arm/boot/dts/tps65217.dtsi b/arch/arm/boot/dts/tps65217.dtsi
index 0d463de5650f..e7db105b3657 100644
--- a/arch/arm/boot/dts/tps65217.dtsi
+++ b/arch/arm/boot/dts/tps65217.dtsi
@@ -27,42 +27,25 @@ pwrbutton {
};
regulators {
- #address-cells = <1>;
- #size-cells = <0>;
-
- dcdc1_reg: regulator@0 {
- reg = <0>;
- regulator-compatible = "dcdc1";
+ dcdc1_reg: dcdc1 {
};
- dcdc2_reg: regulator@1 {
- reg = <1>;
- regulator-compatible = "dcdc2";
+ dcdc2_reg: dcdc2 {
};
- dcdc3_reg: regulator@2 {
- reg = <2>;
- regulator-compatible = "dcdc3";
+ dcdc3_reg: dcdc3 {
};
- ldo1_reg: regulator@3 {
- reg = <3>;
- regulator-compatible = "ldo1";
+ ldo1_reg: ldo1 {
};
- ldo2_reg: regulator@4 {
- reg = <4>;
- regulator-compatible = "ldo2";
+ ldo2_reg: ldo2 {
};
- ldo3_reg: regulator@5 {
- reg = <5>;
- regulator-compatible = "ldo3";
+ ldo3_reg: ldo3 {
};
- ldo4_reg: regulator@6 {
- reg = <6>;
- regulator-compatible = "ldo4";
+ ldo4_reg: ldo4 {
};
};
};
--
2.43.0