Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Johan Jonker <jbx6244@gmail.com>
Link: https://lore.kernel.org/r/20200524160636.16547-1-jbx6244@gmail.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

authored by

Johan Jonker and committed by
Heiko Stuebner
fff987e7 b3a9e3b9

+23 -23
+3 -3
arch/arm/boot/dts/rk322x.dtsi
··· 520 520 resets = <&cru SRST_TSADC>; 521 521 reset-names = "tsadc-apb"; 522 522 pinctrl-names = "init", "default", "sleep"; 523 - pinctrl-0 = <&otp_gpio>; 523 + pinctrl-0 = <&otp_pin>; 524 524 pinctrl-1 = <&otp_out>; 525 - pinctrl-2 = <&otp_gpio>; 525 + pinctrl-2 = <&otp_pin>; 526 526 #thermal-sensor-cells = <0>; 527 527 rockchip,hw-tshut-temp = <95000>; 528 528 status = "disabled"; ··· 1111 1111 }; 1112 1112 1113 1113 tsadc { 1114 - otp_gpio: otp-gpio { 1114 + otp_pin: otp-pin { 1115 1115 rockchip,pins = <0 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>; 1116 1116 }; 1117 1117
+1 -1
arch/arm/boot/dts/rk3288-veyron-jaq.dts
··· 47 47 &sdmmc { 48 48 disable-wp; 49 49 pinctrl-names = "default"; 50 - pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_gpio 50 + pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_pin 51 51 &sdmmc_bus4>; 52 52 }; 53 53
+1 -1
arch/arm/boot/dts/rk3288-veyron-jerry.dts
··· 192 192 &sdmmc { 193 193 disable-wp; 194 194 pinctrl-names = "default"; 195 - pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_gpio 195 + pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_pin 196 196 &sdmmc_bus4>; 197 197 }; 198 198
+3 -3
arch/arm/boot/dts/rk3288-veyron-mighty.dts
··· 18 18 }; 19 19 20 20 &sdmmc { 21 - pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_gpio 22 - &sdmmc_wp_gpio &sdmmc_bus4>; 21 + pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_pin 22 + &sdmmc_wp_pin &sdmmc_bus4>; 23 23 wp-gpios = <&gpio7 10 GPIO_ACTIVE_HIGH>; 24 24 25 25 /delete-property/ disable-wp; ··· 27 27 28 28 &pinctrl { 29 29 sdmmc { 30 - sdmmc_wp_gpio: sdmmc-wp-gpio { 30 + sdmmc_wp_pin: sdmmc-wp-pin { 31 31 rockchip,pins = <7 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; 32 32 }; 33 33 };
+1 -1
arch/arm/boot/dts/rk3288-veyron-minnie.dts
··· 114 114 &sdmmc { 115 115 disable-wp; 116 116 pinctrl-names = "default"; 117 - pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_gpio 117 + pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_pin 118 118 &sdmmc_bus4>; 119 119 }; 120 120
+3 -3
arch/arm/boot/dts/rk3288-veyron-pinky.dts
··· 105 105 }; 106 106 107 107 sdmmc { 108 - sdmmc_wp_gpio: sdmmc-wp-gpio { 108 + sdmmc_wp_pin: sdmmc-wp-pin { 109 109 rockchip,pins = <7 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; 110 110 }; 111 111 }; ··· 126 126 127 127 &sdmmc { 128 128 pinctrl-names = "default"; 129 - pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_gpio 130 - &sdmmc_wp_gpio &sdmmc_bus4>; 129 + pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_pin 130 + &sdmmc_wp_pin &sdmmc_bus4>; 131 131 wp-gpios = <&gpio7 RK_PB2 GPIO_ACTIVE_HIGH>; 132 132 }; 133 133
+1 -1
arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi
··· 41 41 }; 42 42 43 43 /* This is where we actually hook up CD */ 44 - sdmmc_cd_gpio: sdmmc-cd-gpio { 44 + sdmmc_cd_pin: sdmmc-cd-pin { 45 45 rockchip,pins = <7 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; 46 46 }; 47 47 };
+1 -1
arch/arm/boot/dts/rk3288-veyron-speedy.dts
··· 54 54 &sdmmc { 55 55 disable-wp; 56 56 pinctrl-names = "default"; 57 - pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_gpio 57 + pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_pin 58 58 &sdmmc_bus4>; 59 59 }; 60 60
+3 -3
arch/arm/boot/dts/rk3288.dtsi
··· 574 574 resets = <&cru SRST_TSADC>; 575 575 reset-names = "tsadc-apb"; 576 576 pinctrl-names = "init", "default", "sleep"; 577 - pinctrl-0 = <&otp_gpio>; 577 + pinctrl-0 = <&otp_pin>; 578 578 pinctrl-1 = <&otp_out>; 579 - pinctrl-2 = <&otp_gpio>; 579 + pinctrl-2 = <&otp_pin>; 580 580 #thermal-sensor-cells = <1>; 581 581 rockchip,grf = <&grf>; 582 582 rockchip,hw-tshut-temp = <95000>; ··· 1929 1929 }; 1930 1930 1931 1931 tsadc { 1932 - otp_gpio: otp-gpio { 1932 + otp_pin: otp-pin { 1933 1933 rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; 1934 1934 }; 1935 1935
+6 -6
arch/arm/boot/dts/rv1108.dtsi
··· 351 351 clocks = <&cru SCLK_TSADC>, <&cru PCLK_TSADC>; 352 352 clock-names = "tsadc", "apb_pclk"; 353 353 pinctrl-names = "init", "default", "sleep"; 354 - pinctrl-0 = <&otp_gpio>; 354 + pinctrl-0 = <&otp_pin>; 355 355 pinctrl-1 = <&otp_out>; 356 - pinctrl-2 = <&otp_gpio>; 356 + pinctrl-2 = <&otp_pin>; 357 357 resets = <&cru SRST_TSADC>; 358 358 reset-names = "tsadc-apb"; 359 359 rockchip,hw-tshut-temp = <120000>; ··· 728 728 <0 RK_PC6 3 &pcfg_pull_none>; 729 729 }; 730 730 731 - i2c2m1_gpio: i2c2m1-gpio { 731 + i2c2m1_pins: i2c2m1-pins { 732 732 rockchip,pins = <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>, 733 733 <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; 734 734 }; ··· 740 740 <1 RK_PD4 2 &pcfg_pull_none>; 741 741 }; 742 742 743 - i2c2m05v_gpio: i2c2m05v-gpio { 743 + i2c2m05v_pins: i2c2m05v-pins { 744 744 rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>, 745 745 <1 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>; 746 746 }; ··· 867 867 rockchip,pins = <0 RK_PB7 1 &pcfg_pull_none>; 868 868 }; 869 869 870 - otp_gpio: otp-gpio { 870 + otp_pin: otp-pin { 871 871 rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; 872 872 }; 873 873 }; ··· 886 886 rockchip,pins = <3 RK_PA3 1 &pcfg_pull_none>; 887 887 }; 888 888 889 - uart0_rts_gpio: uart0-rts-gpio { 889 + uart0_rts_pin: uart0-rts-pin { 890 890 rockchip,pins = <3 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; 891 891 }; 892 892 };