b45e271e95
Removed upstream patches: - 006-v5.13-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch - 101-dts-rockchip-add-usb3-controller-node-for-RK3328-SoCs.patch - 102-rockchip-enable-LAN-port-on-NanoPi-R2S.patch - 104-rockchip-use-USB-host-by-default-on-rk3399-rock-pi-4.patch - 600-net-phy-Add-driver-for-Motorcomm-YT85xx-PHYs.patch Manually rebased patches: - 103-arm64-rockchip-add-OF-node-for-USB-eth-on-NanoPi-R2S.patch - 203-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch - 204-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus-LTS.patch All other patches were automatically refreshed. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
27 lines
755 B
Diff
27 lines
755 B
Diff
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
|
|
@@ -137,6 +137,11 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
+&sdmmc {
|
|
+ /delete-property/ sd-uhs-sdr104;
|
|
+ cap-sd-highspeed;
|
|
+};
|
|
+
|
|
&u2phy0_host {
|
|
phy-supply = <&vdd_5v>;
|
|
};
|