91 lines
2.3 KiB
Diff
91 lines
2.3 KiB
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/rk3328-roc-cc.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
|
|
@@ -330,7 +330,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
|
|
@@ -119,6 +119,11 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
+&sdmmc {
|
|
+ /delete-property/ sd-uhs-sdr104;
|
|
+ cap-sd-highspeed;
|
|
+};
|
|
+
|
|
&u2phy0_host {
|
|
phy-supply = <&vdd_5v>;
|
|
};
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
|
|
@@ -341,7 +341,7 @@
|
|
max-frequency = <200000000>;
|
|
no-sdio;
|
|
no-mmc;
|
|
- sd-uhs-sdr104;
|
|
+ sd-uhs-sdr50;
|
|
vmmc-supply = <&vcc_3v3_s3>;
|
|
vqmmc-supply = <&vccio_sd_s0>;
|
|
status = "okay";
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
|
|
@@ -617,8 +617,7 @@
|
|
no-sd;
|
|
non-removable;
|
|
max-frequency = <200000000>;
|
|
- mmc-hs400-1_8v;
|
|
- mmc-hs400-enhanced-strobe;
|
|
+ mmc-hs200-1_8v;
|
|
status = "okay";
|
|
};
|
|
|
|
@@ -630,7 +629,7 @@
|
|
disable-wp;
|
|
no-mmc;
|
|
no-sdio;
|
|
- sd-uhs-sdr104;
|
|
+ sd-uhs-sdr50;
|
|
vmmc-supply = <&vcc3v3_sd_s0>;
|
|
vqmmc-supply = <&vccio_sd_s0>;
|
|
status = "okay";
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
|
|
@@ -414,7 +414,7 @@
|
|
cap-mmc-highspeed;
|
|
cap-sd-highspeed;
|
|
disable-wp;
|
|
- sd-uhs-sdr104;
|
|
+ sd-uhs-sdr50;
|
|
vmmc-supply = <&vcc_3v3_s3>;
|
|
vqmmc-supply = <&vccio_sd_s0>;
|
|
status = "okay";
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
|
|
@@ -399,7 +399,7 @@
|
|
max-frequency = <150000000>;
|
|
no-sdio;
|
|
no-mmc;
|
|
- sd-uhs-sdr104;
|
|
+ sd-uhs-sdr50;
|
|
vmmc-supply = <&vcc_3v3_s0>;
|
|
vqmmc-supply = <&vccio_sd_s0>;
|
|
status = "okay";
|