lkml.org 
[lkml]   [2019]   [Dec]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 154/243] ARM: dts: realview-pbx: Fix duplicate regulator nodes
    Date
    From: Rob Herring <robh@kernel.org>

    [ 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 | 5 ++---
    1 file 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 a5676697ff3b7..916a97734f84c 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 @@
    };
    };
    };
    -
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-11 16:24    [W:2.532 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site