Skip to content

Commit 571a9cf

Browse files
arndbarndb
committed
Merge tag 'v5.9-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt
Fuel gauge for Pinebook Pro, the newly added periph-burst flag for pl330s, first tiny part of the rk3399 camera infrastructure and cleanups + making dt-binding-check even happier. * tag 'v5.9-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: Add 'arm,pl330-periph-burst' for dmac arm64: dts: rockchip: remove bus-width from mmc nodes in px30 dts files arm64: dts: rockchip: add rx0 mipi-phy for rk3399 arm64: dts: rockchip: rename and label gpio-led subnodes part 2 arm64: dts: rockchip: rename label and nodename pinctrl subnodes that end with gpio arm64: dts: rockchip: fix rk3399-puma gmac reset gpio arm64: dts: rockchip: fix rk3399-puma vcc5v0-host gpio arm64: dts: rockchip: fix rk3368-lion gmac reset gpio arm64: dts: rockchip: set rockpro64 usbc dr_mode as host arm64: dts: rockchip: add fuel gauge to Pinebook Pro dts Link: https://lore.kernel.org/r/2221560.KYr1Tee2JR@phil Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 67598a4 + 505af91 commit 571a9cf

27 files changed

+175
-135
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@
145145
};
146146

147147
&emmc {
148-
bus-width = <8>;
149148
cap-mmc-highspeed;
150149
mmc-hs200-1_8v;
151150
non-removable;
@@ -499,7 +498,6 @@
499498
};
500499

501500
&sdmmc {
502-
bus-width = <4>;
503501
cap-mmc-highspeed;
504502
cap-sd-highspeed;
505503
card-detect-delay = <800>;
@@ -513,7 +511,6 @@
513511
};
514512

515513
&sdio {
516-
bus-width = <4>;
517514
cap-sd-highspeed;
518515
keep-power-in-suspend;
519516
non-removable;

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,7 @@
714714
reg = <0x0 0xff240000 0x0 0x4000>;
715715
interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
716716
<GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
717+
arm,pl330-periph-burst;
717718
clocks = <&cru ACLK_DMAC>;
718719
clock-names = "apb_pclk";
719720
#dma-cells = <1>;
@@ -733,9 +734,9 @@
733734
rockchip,grf = <&grf>;
734735
rockchip,hw-tshut-temp = <120000>;
735736
pinctrl-names = "init", "default", "sleep";
736-
pinctrl-0 = <&tsadc_otp_gpio>;
737+
pinctrl-0 = <&tsadc_otp_pin>;
737738
pinctrl-1 = <&tsadc_otp_out>;
738-
pinctrl-2 = <&tsadc_otp_gpio>;
739+
pinctrl-2 = <&tsadc_otp_pin>;
739740
#thermal-sensor-cells = <1>;
740741
status = "disabled";
741742
};
@@ -1373,7 +1374,7 @@
13731374
};
13741375

13751376
tsadc {
1376-
tsadc_otp_gpio: tsadc-otp-gpio {
1377+
tsadc_otp_pin: tsadc-otp-pin {
13771378
rockchip,pins =
13781379
<0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
13791380
};

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -524,6 +524,7 @@
524524
reg = <0x0 0xff2c0000 0x0 0x4000>;
525525
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
526526
<GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
527+
arm,pl330-periph-burst;
527528
clocks = <&cru ACLK_DMAC0>;
528529
clock-names = "apb_pclk";
529530
#dma-cells = <1>;
@@ -534,6 +535,7 @@
534535
reg = <0x0 0xff2d0000 0x0 0x4000>;
535536
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
536537
<GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
538+
arm,pl330-periph-burst;
537539
clocks = <&cru ACLK_DMAC1>;
538540
clock-names = "apb_pclk";
539541
#dma-cells = <1>;
@@ -1629,7 +1631,7 @@
16291631
};
16301632

16311633
tsadc {
1632-
tsadc_otp_gpio: tsadc-otp-gpio {
1634+
tsadc_otp_pin: tsadc-otp-pin {
16331635
rockchip,pins =
16341636
<0 RK_PB2 0 &pcfg_pull_none>;
16351637
};
@@ -1657,7 +1659,7 @@
16571659
<2 RK_PA3 1 &pcfg_pull_none>;
16581660
};
16591661

1660-
uart0_rts_gpio: uart0-rts-gpio {
1662+
uart0_rts_pin: uart0-rts-pin {
16611663
rockchip,pins =
16621664
<2 RK_PA3 0 &pcfg_pull_none>;
16631665
};
@@ -1730,7 +1732,7 @@
17301732
<4 RK_PA7 1 &pcfg_pull_none>;
17311733
};
17321734

1733-
uart4_rts_gpio: uart4-rts-gpio {
1735+
uart4_rts_pin: uart4-rts-pin {
17341736
rockchip,pins =
17351737
<4 RK_PA7 0 &pcfg_pull_none>;
17361738
};

‎arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,6 @@
445445
};
446446

447447
&sdmmc {
448-
bus-width = <4>;
449448
cap-sd-highspeed;
450449
card-detect-delay = <200>;
451450
cd-gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_LOW>; /*[> CD GPIO <]*/

‎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: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@
153153
reg = <0x0 0xff1f0000 0x0 0x4000>;
154154
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
155155
<GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
156+
arm,pl330-periph-burst;
156157
clocks = <&cru ACLK_DMAC>;
157158
clock-names = "apb_pclk";
158159
#dma-cells = <1>;
@@ -552,9 +553,9 @@
552553
clocks = <&cru SCLK_TSADC>, <&cru PCLK_TSADC>;
553554
clock-names = "tsadc", "apb_pclk";
554555
pinctrl-names = "init", "default", "sleep";
555-
pinctrl-0 = <&otp_gpio>;
556+
pinctrl-0 = <&otp_pin>;
556557
pinctrl-1 = <&otp_out>;
557-
pinctrl-2 = <&otp_gpio>;
558+
pinctrl-2 = <&otp_pin>;
558559
resets = <&cru SRST_TSADC>;
559560
reset-names = "tsadc-apb";
560561
rockchip,grf = <&grf>;
@@ -1154,7 +1155,7 @@
11541155
rockchip,pins = <0 RK_PA5 2 &pcfg_pull_none>,
11551156
<0 RK_PA6 2 &pcfg_pull_none>;
11561157
};
1157-
i2c3_gpio: i2c3-gpio {
1158+
i2c3_pins: i2c3-pins {
11581159
rockchip,pins =
11591160
<0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>,
11601161
<0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -1225,7 +1226,7 @@
12251226
};
12261227

12271228
tsadc {
1228-
otp_gpio: otp-gpio {
1229+
otp_pin: otp-pin {
12291230
rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
12301231
};
12311232

@@ -1248,7 +1249,7 @@
12481249
rockchip,pins = <1 RK_PB2 1 &pcfg_pull_none>;
12491250
};
12501251

1251-
uart0_rts_gpio: uart0-rts-gpio {
1252+
uart0_rts_pin: uart0-rts-pin {
12521253
rockchip,pins = <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
12531254
};
12541255
};
@@ -1267,7 +1268,7 @@
12671268
rockchip,pins = <3 RK_PA5 4 &pcfg_pull_none>;
12681269
};
12691270

1270-
uart1_rts_gpio: uart1-rts-gpio {
1271+
uart1_rts_pin: uart1-rts-pin {
12711272
rockchip,pins = <3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
12721273
};
12731274
};
@@ -1493,7 +1494,7 @@
14931494
rockchip,pins = <2 RK_PA7 1 &pcfg_pull_up_4ma>;
14941495
};
14951496

1496-
sdmmc0m0_gpio: sdmmc0m0-gpio {
1497+
sdmmc0m0_pin: sdmmc0m0-pin {
14971498
rockchip,pins = <2 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up_4ma>;
14981499
};
14991500
};
@@ -1503,7 +1504,7 @@
15031504
rockchip,pins = <0 RK_PD6 3 &pcfg_pull_up_4ma>;
15041505
};
15051506

1506-
sdmmc0m1_gpio: sdmmc0m1-gpio {
1507+
sdmmc0m1_pin: sdmmc0m1-pin {
15071508
rockchip,pins = <0 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up_4ma>;
15081509
};
15091510
};
@@ -1536,7 +1537,7 @@
15361537
<1 RK_PA3 1 &pcfg_pull_up_8ma>;
15371538
};
15381539

1539-
sdmmc0_gpio: sdmmc0-gpio {
1540+
sdmmc0_pins: sdmmc0-pins {
15401541
rockchip,pins =
15411542
<1 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
15421543
<1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
@@ -1578,7 +1579,7 @@
15781579
<3 RK_PA7 3 &pcfg_pull_up_4ma>;
15791580
};
15801581

1581-
sdmmc0ext_gpio: sdmmc0ext-gpio {
1582+
sdmmc0ext_pins: sdmmc0ext-pins {
15821583
rockchip,pins =
15831584
<3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
15841585
<3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
@@ -1623,7 +1624,7 @@
16231624
<1 RK_PC1 1 &pcfg_pull_up_8ma>;
16241625
};
16251626

1626-
sdmmc1_gpio: sdmmc1-gpio {
1627+
sdmmc1_pins: sdmmc1-pins {
16271628
rockchip,pins =
16281629
<1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
16291630
<1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
@@ -1817,7 +1818,7 @@
18171818
tsadc_int: tsadc-int {
18181819
rockchip,pins = <2 RK_PB5 2 &pcfg_pull_none>;
18191820
};
1820-
tsadc_gpio: tsadc-gpio {
1821+
tsadc_pin: tsadc-pin {
18211822
rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
18221823
};
18231824
};

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
};
2626

2727
leds {
28-
pinctrl-0 = <&led_pins_module>, <&led_sd_haikou>;
28+
pinctrl-0 = <&module_led_pins>, <&sd_card_led_pin>;
2929

30-
sd-card-led {
30+
sd_card_led: led-3 {
3131
label = "sd_card_led";
3232
gpios = <&gpio0 RK_PD2 GPIO_ACTIVE_HIGH>;
3333
linux,default-trigger = "mmc0";
@@ -118,14 +118,14 @@
118118
};
119119

120120
leds {
121-
led_sd_haikou: led-sd-gpio {
121+
sd_card_led_pin: sd-card-led-pin {
122122
rockchip,pins =
123123
<0 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
124124
};
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-lion.dtsi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,16 @@
7676
leds {
7777
compatible = "gpio-leds";
7878
pinctrl-names = "default";
79-
pinctrl-0 = <&led_pins_module>;
79+
pinctrl-0 = <&module_led_pins>;
8080

81-
module_led1 {
81+
module_led1: led-1 {
8282
label = "module_led1";
8383
gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>;
8484
linux,default-trigger = "heartbeat";
8585
panic-indicator;
8686
};
8787

88-
module_led2 {
88+
module_led2: led-2 {
8989
label = "module_led2";
9090
gpios = <&gpio3 RK_PA3 GPIO_ACTIVE_HIGH>;
9191
default-state = "off";
@@ -156,7 +156,7 @@
156156
pinctrl-0 = <&rgmii_pins>;
157157
snps,reset-active-low;
158158
snps,reset-delays-us = <0 10000 50000>;
159-
snps,reset-gpio = <&gpio3 RK_PB3 GPIO_ACTIVE_HIGH>;
159+
snps,reset-gpio = <&gpio3 RK_PB3 GPIO_ACTIVE_LOW>;
160160
tx_delay = <0x10>;
161161
rx_delay = <0x10>;
162162
status = "okay";
@@ -270,7 +270,7 @@
270270

271271
&pinctrl {
272272
leds {
273-
led_pins_module: led-module-gpio {
273+
module_led_pins: module-led-pins {
274274
rockchip,pins =
275275
<2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
276276
<3 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;

0 commit comments

Comments
 (0)