Skip to content

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

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.comSigned-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent b3a9e3b9
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 23 deletions
arch/arm/boot/dts/rk322x.dtsi
View file @ fff987e7
...@@ -520,9 +520,9 @@ tsadc: tsadc@11150000 { ...@@ -520,9 +520,9 @@ tsadc: tsadc@11150000 {
resets = <&cru SRST_TSADC>; resets = <&cru SRST_TSADC>;
reset-names = "tsadc-apb"; reset-names = "tsadc-apb";
pinctrl-names = "init", "default", "sleep"; pinctrl-names = "init", "default", "sleep";
pinctrl-0 = <&otp_gpio>; pinctrl-0 = <&otp_pin>;
pinctrl-1 = <&otp_out>; pinctrl-1 = <&otp_out>;
pinctrl-2 = <&otp_gpio>; pinctrl-2 = <&otp_pin>;
#thermal-sensor-cells = <0>; #thermal-sensor-cells = <0>;
rockchip,hw-tshut-temp = <95000>; rockchip,hw-tshut-temp = <95000>;
status = "disabled"; status = "disabled";
...@@ -1111,7 +1111,7 @@ spdif_tx: spdif-tx { ...@@ -1111,7 +1111,7 @@ spdif_tx: spdif-tx {
}; };
tsadc { tsadc {
otp_gpio: otp-gpio { otp_pin: otp-pin {
rockchip,pins = <0 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
......
arch/arm/boot/dts/rk3288-veyron-jaq.dts
View file @ fff987e7
...@@ -47,7 +47,7 @@ regulator-state-mem { ...@@ -47,7 +47,7 @@ regulator-state-mem {
&sdmmc { &sdmmc {
disable-wp; disable-wp;
pinctrl-names = "default"; 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>; &sdmmc_bus4>;
}; };
......
arch/arm/boot/dts/rk3288-veyron-jerry.dts
View file @ fff987e7
...@@ -192,7 +192,7 @@ mwifiex: wifi@1 { ...@@ -192,7 +192,7 @@ mwifiex: wifi@1 {
&sdmmc { &sdmmc {
disable-wp; disable-wp;
pinctrl-names = "default"; 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>; &sdmmc_bus4>;
}; };
......
arch/arm/boot/dts/rk3288-veyron-mighty.dts
View file @ fff987e7
...@@ -18,8 +18,8 @@ / { ...@@ -18,8 +18,8 @@ / {
}; };
&sdmmc { &sdmmc {
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_wp_gpio &sdmmc_bus4>; &sdmmc_wp_pin &sdmmc_bus4>;
wp-gpios = <&gpio7 10 GPIO_ACTIVE_HIGH>; wp-gpios = <&gpio7 10 GPIO_ACTIVE_HIGH>;
/delete-property/ disable-wp; /delete-property/ disable-wp;
...@@ -27,7 +27,7 @@ &sdmmc { ...@@ -27,7 +27,7 @@ &sdmmc {
&pinctrl { &pinctrl {
sdmmc { sdmmc {
sdmmc_wp_gpio: sdmmc-wp-gpio { sdmmc_wp_pin: sdmmc-wp-pin {
rockchip,pins = <7 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <7 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
......
arch/arm/boot/dts/rk3288-veyron-minnie.dts
View file @ fff987e7
...@@ -114,7 +114,7 @@ regulator-state-mem { ...@@ -114,7 +114,7 @@ regulator-state-mem {
&sdmmc { &sdmmc {
disable-wp; disable-wp;
pinctrl-names = "default"; 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>; &sdmmc_bus4>;
}; };
......
arch/arm/boot/dts/rk3288-veyron-pinky.dts
View file @ fff987e7
...@@ -105,7 +105,7 @@ emmc_reset: emmc-reset { ...@@ -105,7 +105,7 @@ emmc_reset: emmc-reset {
}; };
sdmmc { sdmmc {
sdmmc_wp_gpio: sdmmc-wp-gpio { sdmmc_wp_pin: sdmmc-wp-pin {
rockchip,pins = <7 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <7 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
...@@ -126,8 +126,8 @@ regulator-state-mem { ...@@ -126,8 +126,8 @@ regulator-state-mem {
&sdmmc { &sdmmc {
pinctrl-names = "default"; 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_wp_gpio &sdmmc_bus4>; &sdmmc_wp_pin &sdmmc_bus4>;
wp-gpios = <&gpio7 RK_PB2 GPIO_ACTIVE_HIGH>; wp-gpios = <&gpio7 RK_PB2 GPIO_ACTIVE_HIGH>;
}; };
......
arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi
View file @ fff987e7
...@@ -41,7 +41,7 @@ sdmmc_cd_disabled: sdmmc-cd-disabled { ...@@ -41,7 +41,7 @@ sdmmc_cd_disabled: sdmmc-cd-disabled {
}; };
/* This is where we actually hook up CD */ /* This is where we actually hook up CD */
sdmmc_cd_gpio: sdmmc-cd-gpio { sdmmc_cd_pin: sdmmc-cd-pin {
rockchip,pins = <7 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
......
arch/arm/boot/dts/rk3288-veyron-speedy.dts
View file @ fff987e7
...@@ -54,7 +54,7 @@ &rk808 { ...@@ -54,7 +54,7 @@ &rk808 {
&sdmmc { &sdmmc {
disable-wp; disable-wp;
pinctrl-names = "default"; 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>; &sdmmc_bus4>;
}; };
......
arch/arm/boot/dts/rk3288.dtsi
View file @ fff987e7
...@@ -574,9 +574,9 @@ tsadc: tsadc@ff280000 { ...@@ -574,9 +574,9 @@ tsadc: tsadc@ff280000 {
resets = <&cru SRST_TSADC>; resets = <&cru SRST_TSADC>;
reset-names = "tsadc-apb"; reset-names = "tsadc-apb";
pinctrl-names = "init", "default", "sleep"; pinctrl-names = "init", "default", "sleep";
pinctrl-0 = <&otp_gpio>; pinctrl-0 = <&otp_pin>;
pinctrl-1 = <&otp_out>; pinctrl-1 = <&otp_out>;
pinctrl-2 = <&otp_gpio>; pinctrl-2 = <&otp_pin>;
#thermal-sensor-cells = <1>; #thermal-sensor-cells = <1>;
rockchip,grf = <&grf>; rockchip,grf = <&grf>;
rockchip,hw-tshut-temp = <95000>; rockchip,hw-tshut-temp = <95000>;
...@@ -1929,7 +1929,7 @@ uart4_rts: uart4-rts { ...@@ -1929,7 +1929,7 @@ uart4_rts: uart4-rts {
}; };
tsadc { tsadc {
otp_gpio: otp-gpio { otp_pin: otp-pin {
rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
......
arch/arm/boot/dts/rv1108.dtsi
View file @ fff987e7
...@@ -351,9 +351,9 @@ tsadc: tsadc@10370000 { ...@@ -351,9 +351,9 @@ tsadc: tsadc@10370000 {
clocks = <&cru SCLK_TSADC>, <&cru PCLK_TSADC>; clocks = <&cru SCLK_TSADC>, <&cru PCLK_TSADC>;
clock-names = "tsadc", "apb_pclk"; clock-names = "tsadc", "apb_pclk";
pinctrl-names = "init", "default", "sleep"; pinctrl-names = "init", "default", "sleep";
pinctrl-0 = <&otp_gpio>; pinctrl-0 = <&otp_pin>;
pinctrl-1 = <&otp_out>; pinctrl-1 = <&otp_out>;
pinctrl-2 = <&otp_gpio>; pinctrl-2 = <&otp_pin>;
resets = <&cru SRST_TSADC>; resets = <&cru SRST_TSADC>;
reset-names = "tsadc-apb"; reset-names = "tsadc-apb";
rockchip,hw-tshut-temp = <120000>; rockchip,hw-tshut-temp = <120000>;
...@@ -728,7 +728,7 @@ i2c2m1_xfer: i2c2m1-xfer { ...@@ -728,7 +728,7 @@ i2c2m1_xfer: i2c2m1-xfer {
<0 RK_PC6 3 &pcfg_pull_none>; <0 RK_PC6 3 &pcfg_pull_none>;
}; };
i2c2m1_gpio: i2c2m1-gpio { i2c2m1_pins: i2c2m1-pins {
rockchip,pins = <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>, rockchip,pins = <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>,
<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
...@@ -740,7 +740,7 @@ i2c2m05v_xfer: i2c2m05v-xfer { ...@@ -740,7 +740,7 @@ i2c2m05v_xfer: i2c2m05v-xfer {
<1 RK_PD4 2 &pcfg_pull_none>; <1 RK_PD4 2 &pcfg_pull_none>;
}; };
i2c2m05v_gpio: i2c2m05v-gpio { i2c2m05v_pins: i2c2m05v-pins {
rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>, rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
<1 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>; <1 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
...@@ -867,7 +867,7 @@ otp_out: otp-out { ...@@ -867,7 +867,7 @@ otp_out: otp-out {
rockchip,pins = <0 RK_PB7 1 &pcfg_pull_none>; rockchip,pins = <0 RK_PB7 1 &pcfg_pull_none>;
}; };
otp_gpio: otp-gpio { otp_pin: otp-pin {
rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
...@@ -886,7 +886,7 @@ uart0_rts: uart0-rts { ...@@ -886,7 +886,7 @@ uart0_rts: uart0-rts {
rockchip,pins = <3 RK_PA3 1 &pcfg_pull_none>; rockchip,pins = <3 RK_PA3 1 &pcfg_pull_none>;
}; };
uart0_rts_gpio: uart0-rts-gpio { uart0_rts_pin: uart0-rts-pin {
rockchip,pins = <3 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <3 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7