Skip to content

Commit fec3103

Browse files
arndbarndb
committed
Merge tag 'v6.16-rockchip-dtsfixes1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes
Switch to the gpio variant for spi-cs and mmc-detect for some boards as the in-controller functionality does not work as intended for them. HDMI drive strength adjustment for better ddc communication and some missing supplies. * tag 'v6.16-rockchip-dtsfixes1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: Add missing fan-supply to rk3566-quartz64-a arm64: dts: rockchip: use cs-gpios for spi1 on ringneck arm64: dts: rockchip: list all CPU supplies on ArmSoM Sige5 arm64: dts: rockchip: Add cd-gpios for sdcard detect on Cool Pi 4B arm64: dts: rockchip: Add cd-gpios for sdcard detect on Cool Pi CM5 arm64: dts: rockchip: Adjust the HDMI DDC IO driver strength for rk3588 arm64: dts: rockchip: fix rk3576 pcie1 linux,pci-domain Link: https://lore.kernel.org/r/5108768.AiC22s8V5E@diego Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 1e7c8c5 + 9037532 commit fec3103

9 files changed

+103
-13
lines changed

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,18 @@
379379
<0 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up>;
380380
};
381381
};
382+
383+
spi1 {
384+
spi1_csn0_gpio_pin: spi1-csn0-gpio-pin {
385+
rockchip,pins =
386+
<3 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up_4ma>;
387+
};
388+
389+
spi1_csn1_gpio_pin: spi1-csn1-gpio-pin {
390+
rockchip,pins =
391+
<3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up_4ma>;
392+
};
393+
};
382394
};
383395

384396
&pmu_io_domains {
@@ -396,6 +408,17 @@
396408
vqmmc-supply = <&vccio_sd>;
397409
};
398410

411+
&spi1 {
412+
/*
413+
* Hardware CS has a very slow rise time of about 6us,
414+
* causing transmission errors.
415+
* With cs-gpios we have a rise time of about 20ns.
416+
*/
417+
cs-gpios = <&gpio3 RK_PB1 GPIO_ACTIVE_LOW>, <&gpio3 RK_PB2 GPIO_ACTIVE_LOW>;
418+
pinctrl-names = "default";
419+
pinctrl-0 = <&spi1_clk &spi1_csn0_gpio_pin &spi1_csn1_gpio_pin &spi1_miso &spi1_mosi>;
420+
};
421+
399422
&tsadc {
400423
status = "okay";
401424
};

‎arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
fan: gpio_fan {
3232
compatible = "gpio-fan";
33+
fan-supply = <&vcc12v_dcin>;
3334
gpios = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
3435
gpio-fan,speed-map =
3536
< 0 0>,

‎arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,38 @@
211211
status = "okay";
212212
};
213213

214+
&cpu_b0 {
215+
cpu-supply = <&vdd_cpu_big_s0>;
216+
};
217+
218+
&cpu_b1 {
219+
cpu-supply = <&vdd_cpu_big_s0>;
220+
};
221+
222+
&cpu_b2 {
223+
cpu-supply = <&vdd_cpu_big_s0>;
224+
};
225+
226+
&cpu_b3 {
227+
cpu-supply = <&vdd_cpu_big_s0>;
228+
};
229+
214230
&cpu_l0 {
215231
cpu-supply = <&vdd_cpu_lit_s0>;
216232
};
217233

234+
&cpu_l1 {
235+
cpu-supply = <&vdd_cpu_lit_s0>;
236+
};
237+
238+
&cpu_l2 {
239+
cpu-supply = <&vdd_cpu_lit_s0>;
240+
};
241+
242+
&cpu_l3 {
243+
cpu-supply = <&vdd_cpu_lit_s0>;
244+
};
245+
218246
&gmac0 {
219247
phy-mode = "rgmii-id";
220248
clock_in_out = "output";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@
615615
<0 0 0 2 &pcie1_intc 1>,
616616
<0 0 0 3 &pcie1_intc 2>,
617617
<0 0 0 4 &pcie1_intc 3>;
618-
linux,pci-domain = <0>;
618+
linux,pci-domain = <1>;
619619
max-link-speed = <2>;
620620
num-ib-windows = <8>;
621621
num-viewport = <8>;

‎arch/arm64/boot/dts/rockchip/rk3588-base-pinctrl.dtsi

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -578,14 +578,14 @@
578578
hdmim0_tx0_scl: hdmim0-tx0-scl {
579579
rockchip,pins =
580580
/* hdmim0_tx0_scl */
581-
<4 RK_PB7 5 &pcfg_pull_none>;
581+
<4 RK_PB7 5 &pcfg_pull_none_drv_level_5_smt>;
582582
};
583583

584584
/omit-if-no-ref/
585585
hdmim0_tx0_sda: hdmim0-tx0-sda {
586586
rockchip,pins =
587587
/* hdmim0_tx0_sda */
588-
<4 RK_PC0 5 &pcfg_pull_none>;
588+
<4 RK_PC0 5 &pcfg_pull_none_drv_level_1_smt>;
589589
};
590590

591591
/omit-if-no-ref/
@@ -640,14 +640,14 @@
640640
hdmim1_tx0_scl: hdmim1-tx0-scl {
641641
rockchip,pins =
642642
/* hdmim1_tx0_scl */
643-
<0 RK_PD5 11 &pcfg_pull_none>;
643+
<0 RK_PD5 11 &pcfg_pull_none_drv_level_5_smt>;
644644
};
645645

646646
/omit-if-no-ref/
647647
hdmim1_tx0_sda: hdmim1-tx0-sda {
648648
rockchip,pins =
649649
/* hdmim1_tx0_sda */
650-
<0 RK_PD4 11 &pcfg_pull_none>;
650+
<0 RK_PD4 11 &pcfg_pull_none_drv_level_1_smt>;
651651
};
652652

653653
/omit-if-no-ref/
@@ -668,14 +668,14 @@
668668
hdmim1_tx1_scl: hdmim1-tx1-scl {
669669
rockchip,pins =
670670
/* hdmim1_tx1_scl */
671-
<3 RK_PC6 5 &pcfg_pull_none>;
671+
<3 RK_PC6 5 &pcfg_pull_none_drv_level_5_smt>;
672672
};
673673

674674
/omit-if-no-ref/
675675
hdmim1_tx1_sda: hdmim1-tx1-sda {
676676
rockchip,pins =
677677
/* hdmim1_tx1_sda */
678-
<3 RK_PC5 5 &pcfg_pull_none>;
678+
<3 RK_PC5 5 &pcfg_pull_none_drv_level_1_smt>;
679679
};
680680
/omit-if-no-ref/
681681
hdmim2_rx_cec: hdmim2-rx-cec {
@@ -709,14 +709,14 @@
709709
hdmim2_tx0_scl: hdmim2-tx0-scl {
710710
rockchip,pins =
711711
/* hdmim2_tx0_scl */
712-
<3 RK_PC7 5 &pcfg_pull_none>;
712+
<3 RK_PC7 5 &pcfg_pull_none_drv_level_5_smt>;
713713
};
714714

715715
/omit-if-no-ref/
716716
hdmim2_tx0_sda: hdmim2-tx0-sda {
717717
rockchip,pins =
718718
/* hdmim2_tx0_sda */
719-
<3 RK_PD0 5 &pcfg_pull_none>;
719+
<3 RK_PD0 5 &pcfg_pull_none_drv_level_1_smt>;
720720
};
721721

722722
/omit-if-no-ref/
@@ -730,14 +730,14 @@
730730
hdmim2_tx1_scl: hdmim2-tx1-scl {
731731
rockchip,pins =
732732
/* hdmim2_tx1_scl */
733-
<1 RK_PA4 5 &pcfg_pull_none>;
733+
<1 RK_PA4 5 &pcfg_pull_none_drv_level_5_smt>;
734734
};
735735

736736
/omit-if-no-ref/
737737
hdmim2_tx1_sda: hdmim2-tx1-sda {
738738
rockchip,pins =
739739
/* hdmim2_tx1_sda */
740-
<1 RK_PA3 5 &pcfg_pull_none>;
740+
<1 RK_PA3 5 &pcfg_pull_none_drv_level_1_smt>;
741741
};
742742

743743
/omit-if-no-ref/

‎arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@
321321
bus-width = <4>;
322322
cap-mmc-highspeed;
323323
cap-sd-highspeed;
324+
cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
324325
disable-wp;
325326
max-frequency = <150000000>;
326327
no-sdio;

‎arch/arm64/boot/dts/rockchip/rk3588-extra-pinctrl.dtsi

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,14 +160,15 @@
160160
hdmim0_tx1_scl: hdmim0-tx1-scl {
161161
rockchip,pins =
162162
/* hdmim0_tx1_scl */
163-
<2 RK_PB5 4 &pcfg_pull_none>;
163+
<2 RK_PB5 4 &pcfg_pull_none_drv_level_3_smt>;
164164
};
165165

166166
/omit-if-no-ref/
167167
hdmim0_tx1_sda: hdmim0-tx1-sda {
168168
rockchip,pins =
169169
/* hdmim0_tx1_sda */
170-
<2 RK_PB4 4 &pcfg_pull_none>;
170+
<2 RK_PB4 4 &pcfg_pull_none_drv_level_1_smt>;
171+
171172
};
172173
};
173174

‎arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,7 @@
474474
bus-width = <4>;
475475
cap-mmc-highspeed;
476476
cap-sd-highspeed;
477+
cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
477478
disable-wp;
478479
max-frequency = <150000000>;
479480
no-sdio;

‎arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,41 @@
332332
input-schmitt-enable;
333333
};
334334

335+
/omit-if-no-ref/
336+
pcfg_pull_none_drv_level_1_smt: pcfg-pull-none-drv-level-1-smt {
337+
bias-disable;
338+
drive-strength = <1>;
339+
input-schmitt-enable;
340+
};
341+
342+
/omit-if-no-ref/
343+
pcfg_pull_none_drv_level_2_smt: pcfg-pull-none-drv-level-2-smt {
344+
bias-disable;
345+
drive-strength = <2>;
346+
input-schmitt-enable;
347+
};
348+
349+
/omit-if-no-ref/
350+
pcfg_pull_none_drv_level_3_smt: pcfg-pull-none-drv-level-3-smt {
351+
bias-disable;
352+
drive-strength = <3>;
353+
input-schmitt-enable;
354+
};
355+
356+
/omit-if-no-ref/
357+
pcfg_pull_none_drv_level_4_smt: pcfg-pull-none-drv-level-4-smt {
358+
bias-disable;
359+
drive-strength = <4>;
360+
input-schmitt-enable;
361+
};
362+
363+
/omit-if-no-ref/
364+
pcfg_pull_none_drv_level_5_smt: pcfg-pull-none-drv-level-5-smt {
365+
bias-disable;
366+
drive-strength = <5>;
367+
input-schmitt-enable;
368+
};
369+
335370
/omit-if-no-ref/
336371
pcfg_output_high: pcfg-output-high {
337372
output-high;

0 commit comments

Comments
 (0)