ARM: dts: realview: Fix some more duplicate regulator nodes
authorRob Herring <robh@kernel.org>
Mon, 3 Dec 2018 19:12:48 +0000 (13:12 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 21 Dec 2019 09:41:21 +0000 (10:41 +0100)
commit4912c2cdd16431c1407a731c5086f54783aa78f0
tree854d12bef8af8c7bfe9ce447aa361ea0ce63240a
parentcb57e6880b338f8871702add20b98fb967888c63
ARM: dts: realview: Fix some more duplicate regulator nodes

[ Upstream commit f3b2f758ec1e6cdb13c925647cbd8ad4938b78fb ]

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