Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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.

Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>

authored by

Rob Herring and committed by
Olof Johansson
f3b2f758 f6936d02

+4 -4
+2 -2
arch/arm/boot/dts/arm-realview-pb1176.dts
··· 45 45 }; 46 46 47 47 /* The voltage to the MMC card is hardwired at 3.3V */ 48 - vmmc: fixedregulator@0 { 48 + vmmc: regulator-vmmc { 49 49 compatible = "regulator-fixed"; 50 50 regulator-name = "vmmc"; 51 51 regulator-min-microvolt = <3300000>; ··· 53 53 regulator-boot-on; 54 54 }; 55 55 56 - veth: fixedregulator@0 { 56 + veth: regulator-veth { 57 57 compatible = "regulator-fixed"; 58 58 regulator-name = "veth"; 59 59 regulator-min-microvolt = <3300000>;
+2 -2
arch/arm/boot/dts/arm-realview-pb11mp.dts
··· 145 145 }; 146 146 147 147 /* The voltage to the MMC card is hardwired at 3.3V */ 148 - vmmc: fixedregulator@0 { 148 + vmmc: regulator-vmmc { 149 149 compatible = "regulator-fixed"; 150 150 regulator-name = "vmmc"; 151 151 regulator-min-microvolt = <3300000>; ··· 153 153 regulator-boot-on; 154 154 }; 155 155 156 - veth: fixedregulator@0 { 156 + veth: regulator-veth { 157 157 compatible = "regulator-fixed"; 158 158 regulator-name = "veth"; 159 159 regulator-min-microvolt = <3300000>;