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

Message ID 20181203191248.13067-1-robh@kernel.org
State Accepted
Commit f3b2f758ec1e6cdb13c925647cbd8ad4938b78fb
Headers show
Series
  • ARM: dts: realview: Fix some more duplicate regulator nodes
Related show

Commit Message

Rob Herring Dec. 3, 2018, 7:12 p.m.
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 <linus.walleij@linaro.org>
Signed-off-by: Rob Herring <robh@kernel.org>

---
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(-)

-- 
2.19.1

Comments

Linus Walleij Dec. 3, 2018, 8:39 p.m. | #1
On Mon, Dec 3, 2018 at 8:12 PM Rob Herring <robh@kernel.org> wrote:

> 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 <linus.walleij@linaro.org>

> Signed-off-by: Rob Herring <robh@kernel.org>


Reviewed-by: Linus Walleij <linus.walleij@linaro.org>


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

Yours,
Linus Walleij
Olof Johansson Dec. 3, 2018, 8:40 p.m. | #2
On Mon, Dec 03, 2018 at 01:12:48PM -0600, Rob Herring wrote:
> 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 <linus.walleij@linaro.org>

> Signed-off-by: Rob Herring <robh@kernel.org>

> ---

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


Applied to fixes. Thanks!


-Olof
Olof Johansson Dec. 3, 2018, 8:44 p.m. | #3
On Mon, Dec 3, 2018 at 12:39 PM Linus Walleij <linus.walleij@linaro.org> wrote:
>

> On Mon, Dec 3, 2018 at 8:12 PM Rob Herring <robh@kernel.org> wrote:

>

> > 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 <linus.walleij@linaro.org>

> > Signed-off-by: Rob Herring <robh@kernel.org>

>

> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

>

> 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

Patch

diff --git a/arch/arm/boot/dts/arm-realview-pb1176.dts b/arch/arm/boot/dts/arm-realview-pb1176.dts
index cee2d7aab203..cbbb8878daa3 100644
--- a/arch/arm/boot/dts/arm-realview-pb1176.dts
+++ b/arch/arm/boot/dts/arm-realview-pb1176.dts
@@ -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>;
diff --git a/arch/arm/boot/dts/arm-realview-pb11mp.dts b/arch/arm/boot/dts/arm-realview-pb11mp.dts
index 63d71a1d8282..2015619ca22c 100644
--- a/arch/arm/boot/dts/arm-realview-pb11mp.dts
+++ b/arch/arm/boot/dts/arm-realview-pb11mp.dts
@@ -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>;