ARM: dts: realview: Fix some more duplicate regulator nodes (f3b2f758) · Commits · 戴 / test

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. Signed-off-by:

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

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

Olof Johansson <olof@lixom.net>

arch/arm/boot/dts/arm-realview-pb1176.dts

+2 −2

Original line number	Diff line number	Diff line
		@@ -45,7 +45,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>;
		@@ -53,7 +53,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

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

		veth: fixedregulator@0 {
		veth: regulator-veth {
		compatible = "regulator-fixed";
		regulator-name = "veth";
		regulator-min-microvolt = <3300000>;

Admin message