OSDN Git Service

ARM: dts: realview-pbx: Fix duplicate regulator nodes
authorRob Herring <robh@kernel.org>
Fri, 30 Nov 2018 01:05:47 +0000 (19:05 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 13 Dec 2019 07:52:19 +0000 (08:52 +0100)
commit47d83feb885e2dfa625f0cd50829ea10bd5902e2
tree0d5a41fd1419c1f68a57805aedce4795d3e36f23
parent3ab2e27ba4463d45118457cf9e0bc856ec2a122c
ARM: dts: realview-pbx: Fix duplicate regulator nodes

[ Upstream commit 7f4b001b7f6e0480b5bdab9cd8ce1711e43e5cb5 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/arm/boot/dts/arm-realview-pbx.dtsi