]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
rockchip: drop sdmmc speed limitation for RK3576/RK3588 20432/head
authorTianling Shen <cnsztl@immortalwrt.org>
Fri, 17 Oct 2025 07:28:57 +0000 (15:28 +0800)
committerHauke Mehrtens <hauke@hauke-m.de>
Fri, 5 Dec 2025 23:56:32 +0000 (00:56 +0100)
The stability issue doesn't seem to be found on newer rockchip SoCs
like RK3528, RK3576 and RK3588, so drop the sdr50 limitation.

In addtion, the HS200 limitation for NanoPC T6 is also removed as
upstream fixed the real issue in mmc driver.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Link: https://github.com/openwrt/openwrt/pull/20432
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
target/linux/rockchip/patches-6.12/117-arm64-dts-rockchip-lower-mmc-speed-for-Radxa-Rock-5A.patch [deleted file]
target/linux/rockchip/patches-6.12/119-arm64-dts-rockchip-lower-mmc-speed-for-Radxa-Rock-5B.patch [deleted file]
target/linux/rockchip/patches-6.12/121-arm64-dts-rockchip-lower-mmc-speed-for-nanopc-t6.patch [deleted file]
target/linux/rockchip/patches-6.12/126-arm64-dts-rockchip-lower-mmc-speed-for-ArmSom-Sige7.patch [deleted file]
target/linux/rockchip/patches-6.12/135-arm64-dts-rockchip-lower-mmc-speed-for-Radxa-ROCK-4D.patch [deleted file]

diff --git a/target/linux/rockchip/patches-6.12/117-arm64-dts-rockchip-lower-mmc-speed-for-Radxa-Rock-5A.patch b/target/linux/rockchip/patches-6.12/117-arm64-dts-rockchip-lower-mmc-speed-for-Radxa-Rock-5A.patch
deleted file mode 100644 (file)
index 46bb494..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tianling Shen <cnsztl@gmail.com>
-Date: Mon Aug 05 16:14:33 2024 +0800
-Subject: [PATCH] arm64: dts: rockchip: lower mmc speed for Radxa Rock 5A
-
-The previously stated speed of sdr-104 in is too high for the hardware
-to reliably communicate with some fast SD cards.
-Rockchip boards have a common bug when operating uhs speed, which will
-hang the system during a soft reboot.
-
-To be on the safe side, lower the speed to workaround.
-
-Signed-off-by: Tianling Shen <cnsztl@gmail.com>
----
-
---- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
-@@ -440,7 +440,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";
diff --git a/target/linux/rockchip/patches-6.12/119-arm64-dts-rockchip-lower-mmc-speed-for-Radxa-Rock-5B.patch b/target/linux/rockchip/patches-6.12/119-arm64-dts-rockchip-lower-mmc-speed-for-Radxa-Rock-5B.patch
deleted file mode 100644 (file)
index 63002e7..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tianling Shen <cnsztl@gmail.com>
-Date: Mon Aug 05 16:14:33 2024 +0800
-Subject: [PATCH] arm64: dts: rockchip: lower mmc speed for Radxa Rock 5B
-
-The previously stated speed of sdr-104 in is too high for the hardware
-to reliably communicate with some fast SD cards.
-Rockchip boards have a common bug when operating uhs speed, which will
-hang the system during a soft reboot.
-
-To be on the safe side, lower the speed to workaround.
-
-Signed-off-by: Tianling Shen <cnsztl@gmail.com>
----
-
---- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi
-@@ -452,7 +452,7 @@
-       cap-sd-highspeed;
-       cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
-       disable-wp;
--      sd-uhs-sdr104;
-+      sd-uhs-sdr50;
-       vmmc-supply = <&vcc_3v3_s3>;
-       vqmmc-supply = <&vccio_sd_s0>;
-       status = "okay";
diff --git a/target/linux/rockchip/patches-6.12/121-arm64-dts-rockchip-lower-mmc-speed-for-nanopc-t6.patch b/target/linux/rockchip/patches-6.12/121-arm64-dts-rockchip-lower-mmc-speed-for-nanopc-t6.patch
deleted file mode 100644 (file)
index 0080830..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-@@ -619,8 +619,7 @@
-       no-sd;
-       non-removable;
-       max-frequency = <200000000>;
--      mmc-hs400-1_8v;
--      mmc-hs400-enhanced-strobe;
-+      mmc-hs200-1_8v;
-       status = "okay";
- };
-@@ -632,7 +631,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";
diff --git a/target/linux/rockchip/patches-6.12/126-arm64-dts-rockchip-lower-mmc-speed-for-ArmSom-Sige7.patch b/target/linux/rockchip/patches-6.12/126-arm64-dts-rockchip-lower-mmc-speed-for-ArmSom-Sige7.patch
deleted file mode 100644 (file)
index 01f1c74..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tianling Shen <cnsztl@gmail.com>
-Date: Mon Sep 23 13:22:56 2024 +0800
-Subject: [PATCH] arm64: dts: rockchip: lower mmc speed for ArmSom Sige7
-
-The previously stated speed of sdr-104 in is too high for the hardware
-to reliably communicate with some fast SD cards.
-Rockchip boards have a common bug when operating uhs speed, which will
-hang the system during a soft reboot.
-
-To be on the safe side, lower the speed to workaround.
-
-Signed-off-by: Tianling Shen <cnsztl@gmail.com>
----
-
---- a/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
-@@ -346,7 +346,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";
diff --git a/target/linux/rockchip/patches-6.12/135-arm64-dts-rockchip-lower-mmc-speed-for-Radxa-ROCK-4D.patch b/target/linux/rockchip/patches-6.12/135-arm64-dts-rockchip-lower-mmc-speed-for-Radxa-ROCK-4D.patch
deleted file mode 100644 (file)
index ad5b884..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/arm64/boot/dts/rockchip/rk3576-rock-4d.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3576-rock-4d.dts
-@@ -771,7 +771,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";