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

arm64: dts: rockchip: rename label and nodename pinctrl subnodes that end with gpio 



A test with the command below gives for example this error:

arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dt.yaml:
tsadc: tsadc-otp-gpio:
{'phandle': [[90]], 'rockchip,pins': [[0, 6, 0, 123]]}
is not of type 'array'

'gpio' is a sort of reserved nodename and should not be used
for pinctrl in combination with 'rockchip,pins', so change
nodes that end with 'gpio' to end with 'pin' or 'pins'.

make ARCH=arm64 dtbs_check
DT_SCHEMA_FILES=~/.local/lib/python3.5/site-packages/
dtschema/schemas/gpio/gpio.yaml

Signed-off-by: default avatarJohan Jonker <jbx6244@gmail.com>
Link: https://lore.kernel.org/r/20200524160636.16547-2-jbx6244@gmail.com


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

arch/arm64/boot/dts/rockchip/px30.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -733,9 +733,9 @@ 
		rockchip,grf = <&grf>;

		rockchip,hw-tshut-temp = <120000>;

		pinctrl-names = "init", "default", "sleep";

		pinctrl-0 = <&tsadc_otp_gpio>;

		pinctrl-0 = <&tsadc_otp_pin>;

		pinctrl-1 = <&tsadc_otp_out>;

		pinctrl-2 = <&tsadc_otp_gpio>;

		pinctrl-2 = <&tsadc_otp_pin>;

		#thermal-sensor-cells = <1>;

		status = "disabled";

	};
@@ -1373,7 +1373,7 @@ 
		};



		tsadc {

			tsadc_otp_gpio: tsadc-otp-gpio {

			tsadc_otp_pin: tsadc-otp-pin {

				rockchip,pins =

					<0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;

			};

arch/arm64/boot/dts/rockchip/rk3308.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -1629,7 +1629,7 @@ 
		};



		tsadc {

			tsadc_otp_gpio: tsadc-otp-gpio {

			tsadc_otp_pin: tsadc-otp-pin {

				rockchip,pins =

					<0 RK_PB2 0 &pcfg_pull_none>;

			};
@@ -1657,7 +1657,7 @@ 
					<2 RK_PA3 1 &pcfg_pull_none>;

			};



			uart0_rts_gpio: uart0-rts-gpio {

			uart0_rts_pin: uart0-rts-pin {

				rockchip,pins =

					<2 RK_PA3 0 &pcfg_pull_none>;

			};
@@ -1730,7 +1730,7 @@ 
					<4 RK_PA7 1 &pcfg_pull_none>;

			};



			uart4_rts_gpio: uart4-rts-gpio {

			uart4_rts_pin: uart4-rts-pin {

				rockchip,pins =

					<4 RK_PA7 0 &pcfg_pull_none>;

			};

arch/arm64/boot/dts/rockchip/rk3328-evb.dts

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
		compatible = "regulator-fixed";

		gpio = <&gpio0 30 GPIO_ACTIVE_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&sdmmc0m1_gpio>;

		pinctrl-0 = <&sdmmc0m1_pin>;

		regulator-name = "vcc_sd";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

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

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
		compatible = "regulator-fixed";

		gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&sdmmc0m1_gpio>;

		pinctrl-0 = <&sdmmc0m1_pin>;

		regulator-boot-on;

		regulator-name = "vcc_sd";

		regulator-min-microvolt = <3300000>;

arch/arm64/boot/dts/rockchip/rk3328-rock64.dts

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
		compatible = "regulator-fixed";

		gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&sdmmc0m1_gpio>;

		pinctrl-0 = <&sdmmc0m1_pin>;

		regulator-name = "vcc_sd";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE