lkml.org 
[lkml]   [2021]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 027/156] arm64: dts: rockchip: fix regulator-gpio states array
    Date
    From: Johan Jonker <jbx6244@gmail.com>

    [ Upstream commit b82f8e2992534aab0fa762a37376be30df263701 ]

    A test with the command below gives this error:

    /arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dt.yaml:
    sdmmcio-regulator: states:0:
    [1800000, 1, 3300000, 0] is too long

    dtbs_check expects regulator-gpio states in a format
    of 2 per item, so fix them all.

    make ARCH=arm64 dtbs_check
    DT_SCHEMA_FILES=Documentation/devicetree/bindings/
    regulator/gpio-regulator.yaml

    Signed-off-by: Johan Jonker <jbx6244@gmail.com>
    Link: https://lore.kernel.org/r/20210510215840.16270-1-jbx6244@gmail.com
    Signed-off-by: Heiko Stuebner <heiko@sntech.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 4 ++--
    arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 4 ++--
    arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 4 ++--
    arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 2 +-
    arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 4 ++--
    5 files changed, 9 insertions(+), 9 deletions(-)

    diff --git a/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
    index 3dddd4742c3a..665b2e69455d 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
    +++ b/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
    @@ -84,8 +84,8 @@
    regulator-min-microvolt = <1800000>;
    regulator-max-microvolt = <3300000>;
    gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_HIGH>;
    - states = <1800000 0x0
    - 3300000 0x1>;
    + states = <1800000 0x0>,
    + <3300000 0x1>;
    vin-supply = <&vcc5v0_sys>;
    };

    diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
    index f807bc066ccb..d5001d13e374 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
    +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
    @@ -76,8 +76,8 @@
    regulator-settling-time-us = <5000>;
    regulator-type = "voltage";
    startup-delay-us = <2000>;
    - states = <1800000 0x1
    - 3300000 0x0>;
    + states = <1800000 0x1>,
    + <3300000 0x0>;
    vin-supply = <&vcc_io_33>;
    };

    diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
    index a05732b59f38..a99979afd373 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
    +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
    @@ -50,8 +50,8 @@
    vcc_sdio: sdmmcio-regulator {
    compatible = "regulator-gpio";
    gpios = <&grf_gpio 0 GPIO_ACTIVE_HIGH>;
    - states = <1800000 0x1
    - 3300000 0x0>;
    + states = <1800000 0x1>,
    + <3300000 0x0>;
    regulator-name = "vcc_sdio";
    regulator-type = "voltage";
    regulator-min-microvolt = <1800000>;
    diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi
    index beee5fbb3443..5d7a9d96d163 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi
    +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi
    @@ -245,7 +245,7 @@ pp1800_pcie: &pp1800_s0 {
    };

    &ppvar_sd_card_io {
    - states = <1800000 0x0 3300000 0x1>;
    + states = <1800000 0x0>, <3300000 0x1>;
    regulator-max-microvolt = <3300000>;
    };

    diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
    index 4002742fed4c..c1bcc8ca3769 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
    +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
    @@ -252,8 +252,8 @@
    enable-active-high;
    enable-gpio = <&gpio2 2 GPIO_ACTIVE_HIGH>;
    gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>;
    - states = <1800000 0x1
    - 3000000 0x0>;
    + states = <1800000 0x1>,
    + <3000000 0x0>;

    regulator-min-microvolt = <1800000>;
    regulator-max-microvolt = <3000000>;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-22 19:35    [W:5.244 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site