Skip to contentSkip to conversation

ARM: dts: realview: Fix some more duplicate regulator nodes

PATCH Applied Rob Herring 3 participants 4 messages Dec 3, 2018 Device tree bindings

lore
Share & tools
lore

Rob Herring

author maintainer
#0 lore raw

PATCH 1/1 ARM: dts: realview: Fix some more duplicate regulator nodes

There's a bug in dtc in checking for duplicate node names when there's another section (e.g. "/ { };"). In this case, skeleton.dtsi provides another section. Upon removal of skeleton.dtsi, the dtb fails to build due to a duplicate node 'fixedregulator@0'. As both nodes were pretty much the same 3.3V fixed regulator, it hasn't really mattered. Fix this by renaming the nodes to something unique. In the process, drop the unit-address which shouldn't be present wtihout reg property.

Cc Linus Walleij <[email protected]>
Signed-off-by Rob Herring <[email protected]>

---
Sigh, not sure what happened, but I missed these 2 cases.

 arch/arm/boot/dts/arm-realview-pb1176.dts | 4 ++--
 arch/arm/boot/dts/arm-realview-pb11mp.dts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/arm-realview-pb1176.dts +2 -2
index cee2d7aab203..cbbb8878daa3 100644
@@ -47,7 +47,7 @@
 	};
 
 	/* The voltage to the MMC card is hardwired at 3.3V */
-	vmmc: fixedregulator@0 {
+	vmmc: regulator-vmmc {
 		compatible = "regulator-fixed";
 		regulator-name = "vmmc";
 		regulator-min-microvolt = <3300000>;

@@ -55,7 +55,7 @@
 		regulator-boot-on;
         };
 
-	veth: fixedregulator@0 {
+	veth: regulator-veth {
 		compatible = "regulator-fixed";
 		regulator-name = "veth";
 		regulator-min-microvolt = <3300000>;
arch/arm/boot/dts/arm-realview-pb11mp.dts +2 -2
index 63d71a1d8282..2015619ca22c 100644
@@ -147,7 +147,7 @@
 	};
 
 	/* The voltage to the MMC card is hardwired at 3.3V */
-	vmmc: fixedregulator@0 {
+	vmmc: regulator-vmmc {
 		compatible = "regulator-fixed";
 		regulator-name = "vmmc";
 		regulator-min-microvolt = <3300000>;

@@ -155,7 +155,7 @@
 		regulator-boot-on;
         };
 
-	veth: fixedregulator@0 {
+	veth: regulator-veth {
 		compatible = "regulator-fixed";
 		regulator-name = "veth";
 		regulator-min-microvolt = <3300000>;
Signature · 1 line
2.19.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Rob Herring

There's a bug in dtc in checking for duplicate node names when there's another section (e.g. "/ { };"). In this case, skeleton.dtsi provides another section. Upon removal of skeleton.dtsi, the dtb fails to build due to a duplicate node 'fixedregulator@0'. As both nodes were pretty much the same 3.3V fixed regulator, it hasn't really mattered. Fix this by renaming the nodes to something unique. In the process, drop the unit-address which shouldn't be present wtihout reg property.

Cc Linus Walleij <[email protected]>
Signed-off-by Rob Herring <[email protected]>
Reviewed-by Linus Walleij <[email protected]>

Arm SoC folks: are you applying it directly like with the last one?

Yours,
Linus Walleij

Applied
#3 lore raw
In reply to Rob Herring
Quoted 8 lines · Rob Herring

There's a bug in dtc in checking for duplicate node names when there's another section (e.g. "/ { };"). In this case, skeleton.dtsi provides another section. Upon removal of skeleton.dtsi, the dtb fails to build due to a duplicate node 'fixedregulator@0'. As both nodes were pretty much the same 3.3V fixed regulator, it hasn't really mattered. Fix this by renaming the nodes to something unique. In the process, drop the unit-address which shouldn't be present wtihout reg property.

Quoted 4 lines
Cc Linus Walleij <[email protected]>
Signed-off-by Rob Herring <[email protected]>

---
Sigh, not sure what happened, but I missed these 2 cases.

Applied to fixes. Thanks!

-Olof

#2 lore raw
In reply to Linus Walleij
Quoted 11 lines · Linus Walleij
Quoted 8 lines · Rob Herring

There's a bug in dtc in checking for duplicate node names when there's another section (e.g. "/ { };"). In this case, skeleton.dtsi provides another section. Upon removal of skeleton.dtsi, the dtb fails to build due to a duplicate node 'fixedregulator@0'. As both nodes were pretty much the same 3.3V fixed regulator, it hasn't really mattered. Fix this by renaming the nodes to something unique. In the process, drop the unit-address which shouldn't be present wtihout reg property.

Quoted 7 lines
Quoted 2 lines
Cc Linus Walleij <[email protected]>
Signed-off-by Rob Herring <[email protected]>
Reviewed-by Linus Walleij <[email protected]>

Arm SoC folks: are you applying it directly like with the last one?

Yep, just did (but email didn't go out yet, I tend to batch them up). Revisited and added your Reviewed-by though.

Thanks,

-Olof