lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 275/639] ARM: dts: sun9i: optimus: Fix fixed-regulators
    Date
    From: Maxime Ripard <maxime.ripard@bootlin.com>

    [ Upstream commit c2a5b554751545023056559121a8ecf86aebe541 ]

    Commit 1848f3f44444 ("ARM: dts: sun9i: Remove GPIO pinctrl nodes to avoid
    warnings") was wrong on the optimus, and instead of droping the
    pinctrl-names property, it dropped the regulator-name one.

    Obviously, that wasn't what was intended. Reinstate regulator-name and drop
    pinctrl-names.

    Fixes: 1848f3f44444 ("ARM: dts: sun9i: Remove GPIO pinctrl nodes to avoid warnings")
    Acked-by: Chen-Yu Tsai <wens@csie.org>
    Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/boot/dts/sun9i-a80-optimus.dts | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts
    index 58a199b0e4943..d1e58a6a43432 100644
    --- a/arch/arm/boot/dts/sun9i-a80-optimus.dts
    +++ b/arch/arm/boot/dts/sun9i-a80-optimus.dts
    @@ -82,7 +82,7 @@

    reg_usb1_vbus: usb1-vbus {
    compatible = "regulator-fixed";
    - pinctrl-names = "default";
    + regulator-name = "usb1-vbus";
    regulator-min-microvolt = <5000000>;
    regulator-max-microvolt = <5000000>;
    enable-active-high;
    @@ -91,7 +91,7 @@

    reg_usb3_vbus: usb3-vbus {
    compatible = "regulator-fixed";
    - pinctrl-names = "default";
    + regulator-name = "usb3-vbus";
    regulator-min-microvolt = <5000000>;
    regulator-max-microvolt = <5000000>;
    enable-active-high;
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:15    [W:2.475 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site