Commit 7f4b001b authored by Rob Herring's avatar Rob Herring Committed by Olof Johansson

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: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent f6332990
...@@ -44,7 +44,7 @@ memory { ...@@ -44,7 +44,7 @@ memory {
}; };
/* The voltage to the MMC card is hardwired at 3.3V */ /* The voltage to the MMC card is hardwired at 3.3V */
vmmc: fixedregulator@0 { vmmc: regulator-vmmc {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vmmc"; regulator-name = "vmmc";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
...@@ -52,7 +52,7 @@ vmmc: fixedregulator@0 { ...@@ -52,7 +52,7 @@ vmmc: fixedregulator@0 {
regulator-boot-on; regulator-boot-on;
}; };
veth: fixedregulator@0 { veth: regulator-veth {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "veth"; regulator-name = "veth";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
...@@ -567,4 +567,3 @@ clcd_pads: endpoint { ...@@ -567,4 +567,3 @@ clcd_pads: endpoint {
}; };
}; };
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment