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

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



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

arch/arm/boot/dts/rk3288-tinker.dt.yaml: tsadc: otp-gpio:
{'phandle': [[54]], 'rockchip,pins': [[0, 10, 0, 118]]}
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=arm 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-1-jbx6244@gmail.com


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

arch/arm/boot/dts/rk322x.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -520,9 +520,9 @@ 
		resets = <&cru SRST_TSADC>;

		reset-names = "tsadc-apb";

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

		pinctrl-0 = <&otp_gpio>;

		pinctrl-0 = <&otp_pin>;

		pinctrl-1 = <&otp_out>;

		pinctrl-2 = <&otp_gpio>;

		pinctrl-2 = <&otp_pin>;

		#thermal-sensor-cells = <0>;

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

		status = "disabled";
@@ -1111,7 +1111,7 @@ 
		};



		tsadc {

			otp_gpio: otp-gpio {

			otp_pin: otp-pin {

				rockchip,pins = <0 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;

			};

arch/arm/boot/dts/rk3288-veyron-jaq.dts

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
&sdmmc {

	disable-wp;

	pinctrl-names = "default";

	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_gpio

	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_pin

			&sdmmc_bus4>;

};

arch/arm/boot/dts/rk3288-veyron-jerry.dts

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ 
&sdmmc {

	disable-wp;

	pinctrl-names = "default";

	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_gpio

	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_pin

			&sdmmc_bus4>;

};

arch/arm/boot/dts/rk3288-veyron-mighty.dts

+3 −3
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
};



&sdmmc {

	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_gpio

			&sdmmc_wp_gpio &sdmmc_bus4>;

	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_pin

			&sdmmc_wp_pin &sdmmc_bus4>;

	wp-gpios = <&gpio7 10 GPIO_ACTIVE_HIGH>;



	/delete-property/ disable-wp;
@@ -27,7 +27,7 @@ 


&pinctrl {

	sdmmc {

		sdmmc_wp_gpio: sdmmc-wp-gpio {

		sdmmc_wp_pin: sdmmc-wp-pin {

			rockchip,pins = <7 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>;

		};

	};

arch/arm/boot/dts/rk3288-veyron-minnie.dts

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ 
&sdmmc {

	disable-wp;

	pinctrl-names = "default";

	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_gpio

	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_pin

			&sdmmc_bus4>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE