* [PATCH 0/4] Clean up invalid MMC properties in Rockchip board DTs
@ 2026-09-23 7:11 Shawn Lin
2026-09-23 7:11 ` [PATCH 1/4] arm64: dts: rockchip: Remove broken-cd on Rock 5 ITX SDIO Shawn Lin
` (4 more replies)
0 siblings, 5 replies; 8+ messages in thread
From: Shawn Lin @ 2026-09-23 7:11 UTC (permalink / raw)
To: Heiko Stuebner; +Cc: linux-rockchip, linux-arm-kernel, Shawn Lin
The MMC nodes in both arch/arm64/boot/dts/rockchip and
arch/arm/boot/dts/rockchip contain a few properties that
contradict the card type the node actually describes.
Shawn Lin (4):
arm64: dts: rockchip: Remove broken-cd on Rock 5 ITX SDIO
arm64: dts: rockchip: Remove cap-sd-highspeed on Rock Pi S eMMC
arm64: dts: rockchip: Remove cap-mmc-highspeed from SD-only slots
ARM: dts: rockchip: Remove cap-mmc-highspeed from Omega4 sdmmc0
arch/arm/boot/dts/rockchip/rv1103b-omega4.dtsi | 1 -
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3562-evb2-v10.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi | 1 -
arch/arm64/boot/dts/rockchip/rk3576-anbernic-rg-vita-pro.dts | 2 --
arch/arm64/boot/dts/rockchip/rk3576-armsom-cm5-io.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3576-evb1-v10.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3576-nanopi-r76s.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3576-roc-pc.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3576-rock-4d.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588-armsom-w3.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi | 1 -
arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi | 1 -
arch/arm64/boot/dts/rockchip/rk3588-lubancat-5io.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 1 -
arch/arm64/boot/dts/rockchip/rk3588-ok3588-c.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts | 2 --
arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi | 1 -
arch/arm64/boot/dts/rockchip/rk3588-vicharak-axon.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588-vicharak-vaaman2.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588-youyeetoo-yy3588.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588s-evb1-v10.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588s-lubancat-4.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 1 -
35 files changed, 37 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/4] arm64: dts: rockchip: Remove broken-cd on Rock 5 ITX SDIO
2026-09-23 7:11 [PATCH 0/4] Clean up invalid MMC properties in Rockchip board DTs Shawn Lin
@ 2026-09-23 7:11 ` Shawn Lin
2026-09-23 7:11 ` [PATCH 2/4] arm64: dts: rockchip: Remove cap-sd-highspeed on Rock Pi S eMMC Shawn Lin
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Shawn Lin @ 2026-09-23 7:11 UTC (permalink / raw)
To: Heiko Stuebner; +Cc: linux-rockchip, linux-arm-kernel, Shawn Lin
The M.2 E-KEY SDIO slot is non-removable, so broken-cd is meaningless
and contradicts non-removable. Drop it.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---
arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts
index 6f25e08..241df3f 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts
@@ -895,7 +895,6 @@
/* M.2 E-KEY */
&sdio {
- broken-cd;
bus-width = <4>;
cap-sdio-irq;
keep-power-in-suspend;
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/4] arm64: dts: rockchip: Remove cap-sd-highspeed on Rock Pi S eMMC
2026-09-23 7:11 [PATCH 0/4] Clean up invalid MMC properties in Rockchip board DTs Shawn Lin
2026-09-23 7:11 ` [PATCH 1/4] arm64: dts: rockchip: Remove broken-cd on Rock 5 ITX SDIO Shawn Lin
@ 2026-09-23 7:11 ` Shawn Lin
2026-09-24 16:02 ` Jonas Karlman
2026-09-23 7:11 ` [PATCH 3/4] arm64: dts: rockchip: Remove cap-mmc-highspeed from SD-only slots Shawn Lin
` (2 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Shawn Lin @ 2026-09-23 7:11 UTC (permalink / raw)
To: Heiko Stuebner; +Cc: linux-rockchip, linux-arm-kernel, Shawn Lin
cap-sd-highspeed declares SD high-speed support and has no place on
the non-removable eMMC node. Drop it.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
index c1e3098..677d129 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
@@ -133,7 +133,6 @@
&emmc {
cap-mmc-highspeed;
- cap-sd-highspeed;
no-sdio;
non-removable;
pinctrl-names = "default";
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/4] arm64: dts: rockchip: Remove cap-mmc-highspeed from SD-only slots
2026-09-23 7:11 [PATCH 0/4] Clean up invalid MMC properties in Rockchip board DTs Shawn Lin
2026-09-23 7:11 ` [PATCH 1/4] arm64: dts: rockchip: Remove broken-cd on Rock 5 ITX SDIO Shawn Lin
2026-09-23 7:11 ` [PATCH 2/4] arm64: dts: rockchip: Remove cap-sd-highspeed on Rock Pi S eMMC Shawn Lin
@ 2026-09-23 7:11 ` Shawn Lin
2026-09-23 7:11 ` [PATCH 4/4] ARM: dts: rockchip: Remove cap-mmc-highspeed from Omega4 sdmmc0 Shawn Lin
2026-09-30 18:49 ` (subset) [PATCH 0/4] Clean up invalid MMC properties in Rockchip board DTs Heiko Stuebner
4 siblings, 0 replies; 8+ messages in thread
From: Shawn Lin @ 2026-09-23 7:11 UTC (permalink / raw)
To: Heiko Stuebner; +Cc: linux-rockchip, linux-arm-kernel, Shawn Lin
cap-mmc-highspeed declares MMC high-speed support, which contradicts
the no-mmc property on these SD-only slots. Drop it.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---
arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3562-evb2-v10.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi | 1 -
arch/arm64/boot/dts/rockchip/rk3576-anbernic-rg-vita-pro.dts | 2 --
arch/arm64/boot/dts/rockchip/rk3576-armsom-cm5-io.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3576-evb1-v10.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3576-nanopi-r76s.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3576-roc-pc.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3576-rock-4d.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588-armsom-w3.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi | 1 -
arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi | 1 -
arch/arm64/boot/dts/rockchip/rk3588-lubancat-5io.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 1 -
arch/arm64/boot/dts/rockchip/rk3588-ok3588-c.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi | 1 -
arch/arm64/boot/dts/rockchip/rk3588-vicharak-axon.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588-vicharak-vaaman2.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588-youyeetoo-yy3588.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588s-evb1-v10.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588s-lubancat-4.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 1 -
33 files changed, 34 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dts
index 70aee1a..d337f69 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dts
@@ -387,7 +387,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
disable-wp;
no-sdio;
diff --git a/arch/arm64/boot/dts/rockchip/rk3562-evb2-v10.dts b/arch/arm64/boot/dts/rockchip/rk3562-evb2-v10.dts
index 387062e..04b673a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3562-evb2-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3562-evb2-v10.dts
@@ -418,7 +418,6 @@
no-sdio;
no-mmc;
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
disable-wp;
pinctrl-names = "default";
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts
index fb1f65c..840de17 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts
@@ -500,7 +500,6 @@
&sdmmc0 {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
disable-wp;
no-sdio;
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dts b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dts
index 8e5c182..34b2c0e 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dts
@@ -17,7 +17,6 @@
&sdmmc0 {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
disable-wp;
no-sdio;
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts b/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts
index a7fe5655..ce5b517 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts
@@ -597,7 +597,6 @@
no-sdio;
no-mmc;
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
disable-wp;
sd-uhs-sdr104;
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi
index e3f44ea..8bad11b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi
@@ -515,7 +515,6 @@
no-sdio;
no-mmc;
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
disable-wp;
vmmc-supply = <&vcc3v3_sd>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-anbernic-rg-vita-pro.dts b/arch/arm64/boot/dts/rockchip/rk3576-anbernic-rg-vita-pro.dts
index 358dea4..e66803b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-anbernic-rg-vita-pro.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3576-anbernic-rg-vita-pro.dts
@@ -1134,7 +1134,6 @@
&sdio {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
disable-wp;
max-frequency = <150000000>;
@@ -1165,7 +1164,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
disable-wp;
max-frequency = <150000000>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-armsom-cm5-io.dts b/arch/arm64/boot/dts/rockchip/rk3576-armsom-cm5-io.dts
index 3359632..5958b39 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-armsom-cm5-io.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3576-armsom-cm5-io.dts
@@ -290,7 +290,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
disable-wp;
max-frequency = <200000000>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts b/arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts
index 4ac4465..c5b2f22 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts
@@ -944,7 +944,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
disable-wp;
max-frequency = <200000000>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10.dts
index 4c82980..f83d129 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3576-evb1-v10.dts
@@ -984,7 +984,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;
disable-wp;
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts b/arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts
index 227fe6f..3a30540 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts
@@ -892,7 +892,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
disable-wp;
no-mmc;
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-nanopi-r76s.dts b/arch/arm64/boot/dts/rockchip/rk3576-nanopi-r76s.dts
index 0a5cd5f..7f356fd 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-nanopi-r76s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3576-nanopi-r76s.dts
@@ -757,7 +757,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;
disable-wp;
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3576-roc-pc.dts
index 8411c16..f6bec47f 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-roc-pc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3576-roc-pc.dts
@@ -714,7 +714,6 @@
no-sdio;
no-mmc;
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
disable-wp;
sd-uhs-sdr104;
diff --git a/arch/arm64/boot/dts/rockchip/rk3576-rock-4d.dts b/arch/arm64/boot/dts/rockchip/rk3576-rock-4d.dts
index 272af10..f068794 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-rock-4d.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3576-rock-4d.dts
@@ -785,7 +785,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
disable-wp;
max-frequency = <200000000>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts b/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
index 1005b15..48effab 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
@@ -419,7 +419,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
disable-wp;
max-frequency = <200000000>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-armsom-w3.dts b/arch/arm64/boot/dts/rockchip/rk3588-armsom-w3.dts
index faeddcf..127be31 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-armsom-w3.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-armsom-w3.dts
@@ -403,7 +403,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
disable-wp;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi
index 33dacaa..48aeb22 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi
@@ -322,7 +322,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
disable-wp;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi
index 2751f84..21a9af7 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi
@@ -239,7 +239,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
disable-wp;
no-sdio;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-lubancat-5io.dts b/arch/arm64/boot/dts/rockchip/rk3588-lubancat-5io.dts
index 19598be..eb5d27b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-lubancat-5io.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-lubancat-5io.dts
@@ -841,7 +841,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
disable-wp;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
index eb0eb124..13be56a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -790,7 +790,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
disable-wp;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-ok3588-c.dts b/arch/arm64/boot/dts/rockchip/rk3588-ok3588-c.dts
index fbe1d5c..e03d22c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-ok3588-c.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-ok3588-c.dts
@@ -366,7 +366,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
disable-wp;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts
index 241df3f..33c175b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts
@@ -879,7 +879,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
disable-wp;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi
index 13aaf63..b8d90936 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi
@@ -617,7 +617,6 @@
no-sdio;
no-mmc;
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
disable-wp;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vicharak-axon.dts b/arch/arm64/boot/dts/rockchip/rk3588-vicharak-axon.dts
index 9a540bd..6a97973 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-vicharak-axon.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-vicharak-axon.dts
@@ -374,7 +374,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
disable-wp;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vicharak-vaaman2.dts b/arch/arm64/boot/dts/rockchip/rk3588-vicharak-vaaman2.dts
index f5b0cfc..5e0b9ce 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-vicharak-vaaman2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-vicharak-vaaman2.dts
@@ -187,7 +187,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
disable-wp;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-youyeetoo-yy3588.dts b/arch/arm64/boot/dts/rockchip/rk3588-youyeetoo-yy3588.dts
index b03dc0a..3f20fa0 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-youyeetoo-yy3588.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-youyeetoo-yy3588.dts
@@ -717,7 +717,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
disable-wp;
max-frequency = <150000000>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts b/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
index 2e8661a..c162abe 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
@@ -517,7 +517,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
disable-wp;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3588s-evb1-v10.dts
index c4ddb78..4ec7923 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-evb1-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb1-v10.dts
@@ -478,7 +478,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
disable-wp;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts b/arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts
index d43eb48..5ffc94b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts
@@ -1115,7 +1115,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
disable-wp;
max-frequency = <150000000>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
index ed36c27c..db6adeeb 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
@@ -637,7 +637,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
disable-wp;
no-sdio;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-lubancat-4.dts b/arch/arm64/boot/dts/rockchip/rk3588s-lubancat-4.dts
index 586741a..0d28c61 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-lubancat-4.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-lubancat-4.dts
@@ -371,7 +371,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
disable-wp;
max-frequency = <150000000>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
index a76734d..8d13661 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
@@ -445,7 +445,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
disable-wp;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts
index e478488..3f1b62d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts
@@ -546,7 +546,6 @@
&sdmmc {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
disable-wp;
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/4] ARM: dts: rockchip: Remove cap-mmc-highspeed from Omega4 sdmmc0
2026-09-23 7:11 [PATCH 0/4] Clean up invalid MMC properties in Rockchip board DTs Shawn Lin
` (2 preceding siblings ...)
2026-09-23 7:11 ` [PATCH 3/4] arm64: dts: rockchip: Remove cap-mmc-highspeed from SD-only slots Shawn Lin
@ 2026-09-23 7:11 ` Shawn Lin
2026-09-30 18:49 ` (subset) [PATCH 0/4] Clean up invalid MMC properties in Rockchip board DTs Heiko Stuebner
4 siblings, 0 replies; 8+ messages in thread
From: Shawn Lin @ 2026-09-23 7:11 UTC (permalink / raw)
To: Heiko Stuebner; +Cc: linux-rockchip, linux-arm-kernel, Shawn Lin
cap-mmc-highspeed declares MMC high-speed support, which contradicts
the no-mmc property on this SD-only slot. Drop it.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---
arch/arm/boot/dts/rockchip/rv1103b-omega4.dtsi | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/boot/dts/rockchip/rv1103b-omega4.dtsi b/arch/arm/boot/dts/rockchip/rv1103b-omega4.dtsi
index 6a8e8e0..16664cd 100644
--- a/arch/arm/boot/dts/rockchip/rv1103b-omega4.dtsi
+++ b/arch/arm/boot/dts/rockchip/rv1103b-omega4.dtsi
@@ -93,7 +93,6 @@
&sdmmc0 {
bus-width = <4>;
- cap-mmc-highspeed;
cap-sd-highspeed;
disable-wp;
no-sdio;
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/4] arm64: dts: rockchip: Remove cap-sd-highspeed on Rock Pi S eMMC
2026-09-23 7:11 ` [PATCH 2/4] arm64: dts: rockchip: Remove cap-sd-highspeed on Rock Pi S eMMC Shawn Lin
@ 2026-09-24 16:02 ` Jonas Karlman
2026-09-26 8:38 ` Shawn Lin
0 siblings, 1 reply; 8+ messages in thread
From: Jonas Karlman @ 2026-09-24 16:02 UTC (permalink / raw)
To: Shawn Lin, Heiko Stuebner; +Cc: linux-rockchip, linux-arm-kernel
Hi,
On 9/23/2026 9:11 AM, Shawn Lin wrote:
> cap-sd-highspeed declares SD high-speed support and has no place on
> the non-removable eMMC node. Drop it.
>
> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
> ---
>
> arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
> index c1e3098..677d129 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
> @@ -133,7 +133,6 @@
>
> &emmc {
> cap-mmc-highspeed;
> - cap-sd-highspeed;
The Rock Pi S board has two similar revisions that is supported by this
DT, one has onboard SD NAND Flash and the other one has onboard eMMC
supported by the emmc dw-mshc.
So this board should have both cap-mmc-highspeed and cap-sd-highspeed
here to support best speed depending on board revision.
Regards,
Jonas
> no-sdio;
> non-removable;
> pinctrl-names = "default";
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/4] arm64: dts: rockchip: Remove cap-sd-highspeed on Rock Pi S eMMC
2026-09-24 16:02 ` Jonas Karlman
@ 2026-09-26 8:38 ` Shawn Lin
0 siblings, 0 replies; 8+ messages in thread
From: Shawn Lin @ 2026-09-26 8:38 UTC (permalink / raw)
To: Jonas Karlman, Heiko Stuebner; +Cc: shawn.lin, linux-rockchip, linux-arm-kernel
Hi Jonas
在 2026/09/25 星期五 0:02, Jonas Karlman 写道:
> Hi,
>
> On 9/23/2026 9:11 AM, Shawn Lin wrote:
>> cap-sd-highspeed declares SD high-speed support and has no place on
>> the non-removable eMMC node. Drop it.
>>
>> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
>> ---
>>
>> arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 1 -
>> 1 file changed, 1 deletion(-)
>>
>> diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
>> index c1e3098..677d129 100644
>> --- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
>> +++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
>> @@ -133,7 +133,6 @@
>>
>> &emmc {
>> cap-mmc-highspeed;
>> - cap-sd-highspeed;
>
> The Rock Pi S board has two similar revisions that is supported by this
> DT, one has onboard SD NAND Flash and the other one has onboard eMMC
> supported by the emmc dw-mshc.
>
> So this board should have both cap-mmc-highspeed and cap-sd-highspeed
> here to support best speed depending on board revision.
I didn't know about the board revision, so please ignore patch 2/4.
Thanks.
>
> Regards,
> Jonas
>
>> no-sdio;
>> non-removable;
>> pinctrl-names = "default";
>
>
> _______________________________________________
> Linux-rockchip mailing list
> Linux-rockchip@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-rockchip
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: (subset) [PATCH 0/4] Clean up invalid MMC properties in Rockchip board DTs
2026-09-23 7:11 [PATCH 0/4] Clean up invalid MMC properties in Rockchip board DTs Shawn Lin
` (3 preceding siblings ...)
2026-09-23 7:11 ` [PATCH 4/4] ARM: dts: rockchip: Remove cap-mmc-highspeed from Omega4 sdmmc0 Shawn Lin
@ 2026-09-30 18:49 ` Heiko Stuebner
4 siblings, 0 replies; 8+ messages in thread
From: Heiko Stuebner @ 2026-09-30 18:49 UTC (permalink / raw)
To: Shawn Lin; +Cc: Heiko Stuebner, linux-rockchip, linux-arm-kernel
On Wed, 23 Sep 2026 15:11:34 +0800, Shawn Lin wrote:
> The MMC nodes in both arch/arm64/boot/dts/rockchip and
> arch/arm/boot/dts/rockchip contain a few properties that
> contradict the card type the node actually describes.
>
>
>
> Shawn Lin (4):
> arm64: dts: rockchip: Remove broken-cd on Rock 5 ITX SDIO
> arm64: dts: rockchip: Remove cap-sd-highspeed on Rock Pi S eMMC
> arm64: dts: rockchip: Remove cap-mmc-highspeed from SD-only slots
> ARM: dts: rockchip: Remove cap-mmc-highspeed from Omega4 sdmmc0
>
> [...]
Applied, thanks!
[1/4] arm64: dts: rockchip: Remove broken-cd on Rock 5 ITX SDIO
commit: 7c841000c377a3997e64f45c938dd77bfbd74cc6
[3/4] arm64: dts: rockchip: Remove cap-mmc-highspeed from SD-only slots
commit: c7502a43087748277cf5c55d5a414672e82426c6
[4/4] ARM: dts: rockchip: Remove cap-mmc-highspeed from Omega4 sdmmc0
commit: b86f1ad2e69b3ef2c1bb46f2b585ac8aff44cad2
Best regards,
--
Heiko Stuebner <heiko@sntech.de>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2026-09-30 18:49 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-09-23 7:11 [PATCH 0/4] Clean up invalid MMC properties in Rockchip board DTs Shawn Lin
2026-09-23 7:11 ` [PATCH 1/4] arm64: dts: rockchip: Remove broken-cd on Rock 5 ITX SDIO Shawn Lin
2026-09-23 7:11 ` [PATCH 2/4] arm64: dts: rockchip: Remove cap-sd-highspeed on Rock Pi S eMMC Shawn Lin
2026-09-24 16:02 ` Jonas Karlman
2026-09-26 8:38 ` Shawn Lin
2026-09-23 7:11 ` [PATCH 3/4] arm64: dts: rockchip: Remove cap-mmc-highspeed from SD-only slots Shawn Lin
2026-09-23 7:11 ` [PATCH 4/4] ARM: dts: rockchip: Remove cap-mmc-highspeed from Omega4 sdmmc0 Shawn Lin
2026-09-30 18:49 ` (subset) [PATCH 0/4] Clean up invalid MMC properties in Rockchip board DTs Heiko Stuebner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox