diff options
| author | Rob Herring <robh@kernel.org> | 2018-11-30 02:05:47 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-12-01 00:18:47 +0100 |
| commit | 7f4b001b7f6e0480b5bdab9cd8ce1711e43e5cb5 (patch) | |
| tree | 3cc55e28ee41c4ce54a00db8e6e5526454940b10 /arch/arm/boot/dts/arm-realview-pbx.dtsi | |
| parent | Merge tag 'amlogic-dt64' of https://git.kernel.org/pub/scm/linux/kernel/git/k... (diff) | |
| download | linux-7f4b001b7f6e0480b5bdab9cd8ce1711e43e5cb5.tar.xz linux-7f4b001b7f6e0480b5bdab9cd8ce1711e43e5cb5.zip | |
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>
Diffstat (limited to 'arch/arm/boot/dts/arm-realview-pbx.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/arm-realview-pbx.dtsi | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/arm-realview-pbx.dtsi b/arch/arm/boot/dts/arm-realview-pbx.dtsi index a5676697ff3b..916a97734f84 100644 --- a/arch/arm/boot/dts/arm-realview-pbx.dtsi +++ b/arch/arm/boot/dts/arm-realview-pbx.dtsi @@ -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 @@ }; }; }; - |