2022-06-16 19:03:20 +00:00
|
|
|
From: David Bauer <mail@david-bauer.net>
|
|
|
|
|
Subject: arm64: dts: rockchip: disable UHS modes for NanoPi R4S
|
|
|
|
|
|
|
|
|
|
The NanoPi R4S leaves the SD card in 1.8V signalling when rebooting
|
|
|
|
|
while U-Boot requires the card to be in 3.3V mode.
|
|
|
|
|
|
|
|
|
|
Remove UHS support from the SD controller so the card remains in 3.3V
|
|
|
|
|
mode. This reduces transfer speeds but ensures a reboot whether from
|
|
|
|
|
userspace or following a kernel panic is always working.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: David Bauer <mail@david-bauer.net>
|
|
|
|
|
|
2023-04-23 17:03:25 +00:00
|
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
|
|
|
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
|
|
|
|
|
@@ -335,7 +335,6 @@
|
|
|
|
|
sd-uhs-sdr12;
|
|
|
|
|
sd-uhs-sdr25;
|
|
|
|
|
sd-uhs-sdr50;
|
|
|
|
|
- sd-uhs-sdr104;
|
|
|
|
|
vmmc-supply = <&vcc_sd>;
|
|
|
|
|
vqmmc-supply = <&vcc_sdio>;
|
|
|
|
|
status = "okay";
|
2022-06-16 19:03:20 +00:00
|
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
|
|
|
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
|
|
|
|
|
@@ -121,6 +121,11 @@
|
|
|
|
|
status = "disabled";
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
+&sdmmc {
|
|
|
|
|
+ /delete-property/ sd-uhs-sdr104;
|
|
|
|
|
+ cap-sd-highspeed;
|
|
|
|
|
+};
|
|
|
|
|
+
|
|
|
|
|
&u2phy0_host {
|
|
|
|
|
phy-supply = <&vdd_5v>;
|
|
|
|
|
};
|
