Commit b82f8e29 authored by Johan Jonker's avatar Johan Jonker Committed by Heiko Stuebner
Browse files

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



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: default avatarJohan Jonker <jbx6244@gmail.com>
Link: https://lore.kernel.org/r/20210510215840.16270-1-jbx6244@gmail.com


Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 837188d4

arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts

+2 −2
Original line number Diff line number Diff line
@@ -84,8 +84,8 @@ vcc_sdmmc: vcc-sdmmc { 
		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>;

	};

arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts

+2 −2
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ vcc_io_sdio: sdmmcio-regulator { 
		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>;

	};

arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ vcc_sd: sdmmc-regulator { 
	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>;

arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ &ppvar_gpu_pwm { 
};



&ppvar_sd_card_io {

	states = <1800000 0x0 3300000 0x1>;

	states = <1800000 0x0>, <3300000 0x1>;

	regulator-max-microvolt = <3300000>;

};

arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -252,8 +252,8 @@ ppvar_sd_card_io: ppvar-sd-card-io { 
		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>;