aboutsummaryrefslogtreecommitdiff
path: root/target/linux/rockchip/patches-6.6/105-nanopi-r4s-sd-signalling.patch
diff options
context:
space:
mode:
authorAntonio Flores <antflores627@gmail.com>2024-04-19 12:49:23 -0400
committerNick Hainke <vincent@systemli.org>2024-05-07 00:17:12 +0200
commitddfd526140ac279c88f0da3d1c11204f8954ca43 (patch)
tree447bc06c2ad2366487850c8f9ba4ce6e1d626b31 /target/linux/rockchip/patches-6.6/105-nanopi-r4s-sd-signalling.patch
parent8cf28cc6a5ee4f74a9101bc26433c26e7f899c96 (diff)
kernel/rockchip: Create kernel files for v6.6 (from v6.1)
This is an automatically generated commit. When doing `git bisect`, consider `git bisect --skip`. Signed-off-by: Antonio Flores <antflores627@gmail.com>
Diffstat (limited to 'target/linux/rockchip/patches-6.6/105-nanopi-r4s-sd-signalling.patch')
-rw-r--r--target/linux/rockchip/patches-6.6/105-nanopi-r4s-sd-signalling.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/rockchip/patches-6.6/105-nanopi-r4s-sd-signalling.patch b/target/linux/rockchip/patches-6.6/105-nanopi-r4s-sd-signalling.patch
new file mode 100644
index 0000000000..b3c941821a
--- /dev/null
+++ b/target/linux/rockchip/patches-6.6/105-nanopi-r4s-sd-signalling.patch
@@ -0,0 +1,36 @@
+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/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";
+--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
+@@ -112,6 +112,11 @@
+ status = "disabled";
+ };
+
++&sdmmc {
++ /delete-property/ sd-uhs-sdr104;
++ cap-sd-highspeed;
++};
++
+ &u2phy0_host {
+ phy-supply = <&vdd_5v>;
+ };