Skip to content

Commit 2bc65fe

Browse files
Johan Jonkermmind
Johan Jonker
authored and
mmind
committed
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: Johan Jonker <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Heiko Stuebner <[email protected]>
1 parent 8a44508 commit 2bc65fe

20 files changed

+94
-94
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -733,9 +733,9 @@
733733
rockchip,grf = <&grf>;
734734
rockchip,hw-tshut-temp = <120000>;
735735
pinctrl-names = "init", "default", "sleep";
736-
pinctrl-0 = <&tsadc_otp_gpio>;
736+
pinctrl-0 = <&tsadc_otp_pin>;
737737
pinctrl-1 = <&tsadc_otp_out>;
738-
pinctrl-2 = <&tsadc_otp_gpio>;
738+
pinctrl-2 = <&tsadc_otp_pin>;
739739
#thermal-sensor-cells = <1>;
740740
status = "disabled";
741741
};
@@ -1373,7 +1373,7 @@
13731373
};
13741374

13751375
tsadc {
1376-
tsadc_otp_gpio: tsadc-otp-gpio {
1376+
tsadc_otp_pin: tsadc-otp-pin {
13771377
rockchip,pins =
13781378
<0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
13791379
};

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1629,7 +1629,7 @@
16291629
};
16301630

16311631
tsadc {
1632-
tsadc_otp_gpio: tsadc-otp-gpio {
1632+
tsadc_otp_pin: tsadc-otp-pin {
16331633
rockchip,pins =
16341634
<0 RK_PB2 0 &pcfg_pull_none>;
16351635
};
@@ -1657,7 +1657,7 @@
16571657
<2 RK_PA3 1 &pcfg_pull_none>;
16581658
};
16591659

1660-
uart0_rts_gpio: uart0-rts-gpio {
1660+
uart0_rts_pin: uart0-rts-pin {
16611661
rockchip,pins =
16621662
<2 RK_PA3 0 &pcfg_pull_none>;
16631663
};
@@ -1730,7 +1730,7 @@
17301730
<4 RK_PA7 1 &pcfg_pull_none>;
17311731
};
17321732

1733-
uart4_rts_gpio: uart4-rts-gpio {
1733+
uart4_rts_pin: uart4-rts-pin {
17341734
rockchip,pins =
17351735
<4 RK_PA7 0 &pcfg_pull_none>;
17361736
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
compatible = "regulator-fixed";
4242
gpio = <&gpio0 30 GPIO_ACTIVE_LOW>;
4343
pinctrl-names = "default";
44-
pinctrl-0 = <&sdmmc0m1_gpio>;
44+
pinctrl-0 = <&sdmmc0m1_pin>;
4545
regulator-name = "vcc_sd";
4646
regulator-min-microvolt = <3300000>;
4747
regulator-max-microvolt = <3300000>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
compatible = "regulator-fixed";
3535
gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;
3636
pinctrl-names = "default";
37-
pinctrl-0 = <&sdmmc0m1_gpio>;
37+
pinctrl-0 = <&sdmmc0m1_pin>;
3838
regulator-boot-on;
3939
regulator-name = "vcc_sd";
4040
regulator-min-microvolt = <3300000>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
compatible = "regulator-fixed";
2626
gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;
2727
pinctrl-names = "default";
28-
pinctrl-0 = <&sdmmc0m1_gpio>;
28+
pinctrl-0 = <&sdmmc0m1_pin>;
2929
regulator-name = "vcc_sd";
3030
regulator-min-microvolt = <3300000>;
3131
regulator-max-microvolt = <3300000>;

‎arch/arm64/boot/dts/rockchip/rk3328.dtsi

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -552,9 +552,9 @@
552552
clocks = <&cru SCLK_TSADC>, <&cru PCLK_TSADC>;
553553
clock-names = "tsadc", "apb_pclk";
554554
pinctrl-names = "init", "default", "sleep";
555-
pinctrl-0 = <&otp_gpio>;
555+
pinctrl-0 = <&otp_pin>;
556556
pinctrl-1 = <&otp_out>;
557-
pinctrl-2 = <&otp_gpio>;
557+
pinctrl-2 = <&otp_pin>;
558558
resets = <&cru SRST_TSADC>;
559559
reset-names = "tsadc-apb";
560560
rockchip,grf = <&grf>;
@@ -1154,7 +1154,7 @@
11541154
rockchip,pins = <0 RK_PA5 2 &pcfg_pull_none>,
11551155
<0 RK_PA6 2 &pcfg_pull_none>;
11561156
};
1157-
i2c3_gpio: i2c3-gpio {
1157+
i2c3_pins: i2c3-pins {
11581158
rockchip,pins =
11591159
<0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>,
11601160
<0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -1225,7 +1225,7 @@
12251225
};
12261226

12271227
tsadc {
1228-
otp_gpio: otp-gpio {
1228+
otp_pin: otp-pin {
12291229
rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
12301230
};
12311231

@@ -1248,7 +1248,7 @@
12481248
rockchip,pins = <1 RK_PB2 1 &pcfg_pull_none>;
12491249
};
12501250

1251-
uart0_rts_gpio: uart0-rts-gpio {
1251+
uart0_rts_pin: uart0-rts-pin {
12521252
rockchip,pins = <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
12531253
};
12541254
};
@@ -1267,7 +1267,7 @@
12671267
rockchip,pins = <3 RK_PA5 4 &pcfg_pull_none>;
12681268
};
12691269

1270-
uart1_rts_gpio: uart1-rts-gpio {
1270+
uart1_rts_pin: uart1-rts-pin {
12711271
rockchip,pins = <3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
12721272
};
12731273
};
@@ -1493,7 +1493,7 @@
14931493
rockchip,pins = <2 RK_PA7 1 &pcfg_pull_up_4ma>;
14941494
};
14951495

1496-
sdmmc0m0_gpio: sdmmc0m0-gpio {
1496+
sdmmc0m0_pin: sdmmc0m0-pin {
14971497
rockchip,pins = <2 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up_4ma>;
14981498
};
14991499
};
@@ -1503,7 +1503,7 @@
15031503
rockchip,pins = <0 RK_PD6 3 &pcfg_pull_up_4ma>;
15041504
};
15051505

1506-
sdmmc0m1_gpio: sdmmc0m1-gpio {
1506+
sdmmc0m1_pin: sdmmc0m1-pin {
15071507
rockchip,pins = <0 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up_4ma>;
15081508
};
15091509
};
@@ -1536,7 +1536,7 @@
15361536
<1 RK_PA3 1 &pcfg_pull_up_8ma>;
15371537
};
15381538

1539-
sdmmc0_gpio: sdmmc0-gpio {
1539+
sdmmc0_pins: sdmmc0-pins {
15401540
rockchip,pins =
15411541
<1 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
15421542
<1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
@@ -1578,7 +1578,7 @@
15781578
<3 RK_PA7 3 &pcfg_pull_up_4ma>;
15791579
};
15801580

1581-
sdmmc0ext_gpio: sdmmc0ext-gpio {
1581+
sdmmc0ext_pins: sdmmc0ext-pins {
15821582
rockchip,pins =
15831583
<3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
15841584
<3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
@@ -1623,7 +1623,7 @@
16231623
<1 RK_PC1 1 &pcfg_pull_up_8ma>;
16241624
};
16251625

1626-
sdmmc1_gpio: sdmmc1-gpio {
1626+
sdmmc1_pins: sdmmc1-pins {
16271627
rockchip,pins =
16281628
<1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
16291629
<1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
@@ -1817,7 +1817,7 @@
18171817
tsadc_int: tsadc-int {
18181818
rockchip,pins = <2 RK_PB5 2 &pcfg_pull_none>;
18191819
};
1820-
tsadc_gpio: tsadc-gpio {
1820+
tsadc_pin: tsadc-pin {
18211821
rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
18221822
};
18231823
};

‎arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
};
126126

127127
sdmmc {
128-
sdmmc_cd_gpio: sdmmc-cd-gpio {
128+
sdmmc_cd_pin: sdmmc-cd-pin {
129129
rockchip,pins =
130130
<2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
131131
};

‎arch/arm64/boot/dts/rockchip/rk3368.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -483,9 +483,9 @@
483483
resets = <&cru SRST_TSADC>;
484484
reset-names = "tsadc-apb";
485485
pinctrl-names = "init", "default", "sleep";
486-
pinctrl-0 = <&otp_gpio>;
486+
pinctrl-0 = <&otp_pin>;
487487
pinctrl-1 = <&otp_out>;
488-
pinctrl-2 = <&otp_gpio>;
488+
pinctrl-2 = <&otp_pin>;
489489
#thermal-sensor-cells = <1>;
490490
rockchip,hw-tshut-temp = <95000>;
491491
status = "disabled";
@@ -1145,7 +1145,7 @@
11451145
};
11461146

11471147
tsadc {
1148-
otp_gpio: otp-gpio {
1148+
otp_pin: otp-pin {
11491149
rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
11501150
};
11511151

‎arch/arm64/boot/dts/rockchip/rk3399-firefly.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -589,11 +589,11 @@
589589
};
590590

591591
pmic {
592-
vsel1_gpio: vsel1-gpio {
592+
vsel1_pin: vsel1-pin {
593593
rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
594594
};
595595

596-
vsel2_gpio: vsel2-gpio {
596+
vsel2_pin: vsel2-pin {
597597
rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
598598
};
599599
};

‎arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ camera: &i2c7 {
499499
};
500500

501501
/* there is no external pull up, so need to set this pin pull up */
502-
&sdmmc_cd_gpio {
502+
&sdmmc_cd_pin {
503503
rockchip,pins = <1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_up>;
504504
};
505505

0 commit comments

Comments
 (0)