OSDN Git Service

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>
Fri, 13 Dec 2019 07:52:23 +0000 (08:52 +0100)
commitab9d56dace3bdd7ed6957923b85c6cb29f959d68
treea1e02748433bfdeffedbacb820918832b7f7e531
parent82bfaec726d3e0a5318c9cd17ad0a24a6007e479
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