Commit 7f4b001b authored Nov 29, 2018 by Rob Herring Committed by Olof Johansson Nov 30, 2018

ARM: dts: realview-pbx: Fix 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 <linus.walleij@linaro.org>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Olof Johansson <olof@lixom.net>

parent f6332990

arch/arm/boot/dts/arm-realview-pbx.dtsi

+2 −3

Original line number	Diff line number	Diff line
		@@ -44,7 +44,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>;
		@@ -52,7 +52,7 @@
		regulator-boot-on;
		};

		veth: fixedregulator@0 {
		veth: regulator-veth {
		compatible = "regulator-fixed";
		regulator-name = "veth";
		regulator-min-microvolt = <3300000>;
		@@ -567,4 +567,3 @@
		};
		};
		};

Admin message