aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Bauer <mail@david-bauer.net>2022-01-25 21:46:54 +0100
committerDavid Bauer <mail@david-bauer.net>2022-01-27 01:44:28 +0100
commit2b583ab8a74a6bd41f1c9629b3b66ba561d6fceb (patch)
tree5cdeca41abbe5fddf42ceb963378643a7b1df73e
parentd8c5406a93d7d99c5abbec6d3a042922b6b4f8e2 (diff)
downloadupstream-2b583ab8a74a6bd41f1c9629b3b66ba561d6fceb.tar.gz
upstream-2b583ab8a74a6bd41f1c9629b3b66ba561d6fceb.tar.bz2
upstream-2b583ab8a74a6bd41f1c9629b3b66ba561d6fceb.zip
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>
-rw-r--r--target/linux/rockchip/patches-5.10/105-nanopi-r4s-sd-signalling.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/target/linux/rockchip/patches-5.10/105-nanopi-r4s-sd-signalling.patch b/target/linux/rockchip/patches-5.10/105-nanopi-r4s-sd-signalling.patch
new file mode 100644
index 0000000000..a04c14b70a
--- /dev/null
+++ b/target/linux/rockchip/patches-5.10/105-nanopi-r4s-sd-signalling.patch
@@ -0,0 +1,26 @@
+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>
+
+--- 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>;
+ };