Skip to content

Commit 484aeb0

Browse files
committed
Merge tag 'v6.14-rockchip-dtsfixes2' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes
A number of emmc fixes (removing CQE from Theobroma boards and slower freq on Rock-5-ITX) as well as some pinmux fixes and missing supplies. * tag 'v6.14-rockchip-dtsfixes2' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: slow down emmc freq for rock 5 itx arm64: dts: rockchip: Add missing PCIe supplies to RockPro64 board dtsi arm64: dts: rockchip: Add avdd HDMI supplies to RockPro64 board dtsi arm64: dts: rockchip: Remove undocumented sdmmc property from lubancat-1 arm64: dts: rockchip: fix pinmux of UART5 for PX30 Ringneck on Haikou arm64: dts: rockchip: fix pinmux of UART0 for PX30 Ringneck on Haikou arm64: dts: rockchip: fix u2phy1_host status for NanoPi R4S arm64: dts: rockchip: remove supports-cqe from rk3588 tiger arm64: dts: rockchip: remove supports-cqe from rk3588 jaguar Link: https://lore.kernel.org/r/1990830.tdWV9SEqCh@phil Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 0bf88b1 + b36402e commit 484aeb0

File tree

7 files changed

+28
-6
lines changed

7 files changed

+28
-6
lines changed

arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,13 @@
194194
<3 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
195195
};
196196
};
197+
198+
uart {
199+
uart5_rts_pin: uart5-rts-pin {
200+
rockchip,pins =
201+
<0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
202+
};
203+
};
197204
};
198205

199206
&pwm0 {
@@ -222,10 +229,15 @@
222229
};
223230

224231
&uart0 {
232+
pinctrl-names = "default";
233+
pinctrl-0 = <&uart0_xfer>;
225234
status = "okay";
226235
};
227236

228237
&uart5 {
238+
/* Add pinmux for rts-gpios (uart5_rts_pin) */
239+
pinctrl-names = "default";
240+
pinctrl-0 = <&uart5_xfer &uart5_rts_pin>;
229241
rts-gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
230242
status = "okay";
231243
};

arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
};
116116

117117
&u2phy1_host {
118-
status = "disabled";
118+
phy-supply = <&vdd_5v>;
119119
};
120120

121121
&uart0 {

arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,16 @@
227227
vin-supply = <&vcc12v_dcin>;
228228
};
229229

230+
vcca_0v9: regulator-vcca-0v9 {
231+
compatible = "regulator-fixed";
232+
regulator-name = "vcca_0v9";
233+
regulator-always-on;
234+
regulator-boot-on;
235+
regulator-min-microvolt = <900000>;
236+
regulator-max-microvolt = <900000>;
237+
vin-supply = <&vcc3v3_sys>;
238+
};
239+
230240
vdd_log: regulator-vdd-log {
231241
compatible = "pwm-regulator";
232242
pwms = <&pwm2 0 25000 1>;
@@ -312,6 +322,8 @@
312322
};
313323

314324
&hdmi {
325+
avdd-0v9-supply = <&vcca_0v9>;
326+
avdd-1v8-supply = <&vcc1v8_dvp>;
315327
ddc-i2c-bus = <&i2c3>;
316328
pinctrl-names = "default";
317329
pinctrl-0 = <&hdmi_cec>;
@@ -661,6 +673,8 @@
661673
num-lanes = <4>;
662674
pinctrl-names = "default";
663675
pinctrl-0 = <&pcie_perst>;
676+
vpcie0v9-supply = <&vcca_0v9>;
677+
vpcie1v8-supply = <&vcca_1v8>;
664678
vpcie12v-supply = <&vcc12v_dcin>;
665679
vpcie3v3-supply = <&vcc3v3_pcie>;
666680
status = "okay";

arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,6 @@
512512

513513
&sdmmc0 {
514514
max-frequency = <150000000>;
515-
supports-sd;
516515
bus-width = <4>;
517516
cap-mmc-highspeed;
518517
cap-sd-highspeed;

arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,6 @@
503503
non-removable;
504504
pinctrl-names = "default";
505505
pinctrl-0 = <&emmc_bus8 &emmc_cmd &emmc_clk &emmc_data_strobe>;
506-
supports-cqe;
507506
vmmc-supply = <&vcc_3v3_s3>;
508507
vqmmc-supply = <&vcc_1v8_s3>;
509508
status = "okay";

arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -690,10 +690,9 @@
690690

691691
&sdhci {
692692
bus-width = <8>;
693-
max-frequency = <200000000>;
693+
max-frequency = <150000000>;
694694
mmc-hs400-1_8v;
695695
mmc-hs400-enhanced-strobe;
696-
mmc-hs200-1_8v;
697696
no-sdio;
698697
no-sd;
699698
non-removable;

arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,6 @@
386386
non-removable;
387387
pinctrl-names = "default";
388388
pinctrl-0 = <&emmc_bus8 &emmc_cmd &emmc_clk &emmc_data_strobe>;
389-
supports-cqe;
390389
vmmc-supply = <&vcc_3v3_s3>;
391390
vqmmc-supply = <&vcc_1v8_s3>;
392391
status = "okay";

0 commit comments

Comments
 (0)