arm64: dts: rockchip: fix regulator-gpio states array

[ 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>

diff --git a/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
index 7a96be10eaf0d3431f5602bb41edef94af7ca67d..bce6f8b7db43629fcb5306c1584ada9c541562c4 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
@@ -78,8 +78,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 1eecad724f04c74cea2e01369b528e9c7632ecd8..83a0bdbe00d6f4cc20ba336b212373dcb79254a2 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
@@ -71,8 +71,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 b76282e704de1879dbe5e33b57e44494b424ec99..daa9a0c601a9f21f17faf430cd4c97216496d0b2 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
@@ -45,8 +45,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 60cd1c18cd4e0ec44f086396d70e8c96c64b0e23..e9ecffc409c0bf114094a16a79f015990ef00a70 100644 (file)
--- 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 32dcaf210085538c91b0d6f690d64072e9a10ec7..765b24a2bcbf06d217a9400cca4e7df51c732088 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
@@ -247,8 +247,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>;