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

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.comSigned-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 837188d4
...@@ -84,8 +84,8 @@ vcc_sdmmc: vcc-sdmmc { ...@@ -84,8 +84,8 @@ vcc_sdmmc: vcc-sdmmc {
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_HIGH>;
states = <1800000 0x0 states = <1800000 0x0>,
3300000 0x1>; <3300000 0x1>;
vin-supply = <&vcc5v0_sys>; vin-supply = <&vcc5v0_sys>;
}; };
......
...@@ -77,8 +77,8 @@ vcc_io_sdio: sdmmcio-regulator { ...@@ -77,8 +77,8 @@ vcc_io_sdio: sdmmcio-regulator {
regulator-settling-time-us = <5000>; regulator-settling-time-us = <5000>;
regulator-type = "voltage"; regulator-type = "voltage";
startup-delay-us = <2000>; startup-delay-us = <2000>;
states = <1800000 0x1 states = <1800000 0x1>,
3300000 0x0>; <3300000 0x0>;
vin-supply = <&vcc_io_33>; vin-supply = <&vcc_io_33>;
}; };
......
...@@ -50,8 +50,8 @@ vcc_sd: sdmmc-regulator { ...@@ -50,8 +50,8 @@ vcc_sd: sdmmc-regulator {
vcc_sdio: sdmmcio-regulator { vcc_sdio: sdmmcio-regulator {
compatible = "regulator-gpio"; compatible = "regulator-gpio";
gpios = <&grf_gpio 0 GPIO_ACTIVE_HIGH>; gpios = <&grf_gpio 0 GPIO_ACTIVE_HIGH>;
states = <1800000 0x1 states = <1800000 0x1>,
3300000 0x0>; <3300000 0x0>;
regulator-name = "vcc_sdio"; regulator-name = "vcc_sdio";
regulator-type = "voltage"; regulator-type = "voltage";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
......
...@@ -245,7 +245,7 @@ &ppvar_gpu_pwm { ...@@ -245,7 +245,7 @@ &ppvar_gpu_pwm {
}; };
&ppvar_sd_card_io { &ppvar_sd_card_io {
states = <1800000 0x0 3300000 0x1>; states = <1800000 0x0>, <3300000 0x1>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
}; };
......
...@@ -252,8 +252,8 @@ ppvar_sd_card_io: ppvar-sd-card-io { ...@@ -252,8 +252,8 @@ ppvar_sd_card_io: ppvar-sd-card-io {
enable-active-high; enable-active-high;
enable-gpio = <&gpio2 2 GPIO_ACTIVE_HIGH>; enable-gpio = <&gpio2 2 GPIO_ACTIVE_HIGH>;
gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>; gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>;
states = <1800000 0x1 states = <1800000 0x1>,
3000000 0x0>; <3000000 0x0>;
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3000000>; regulator-max-microvolt = <3000000>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment