Skip to contentSkip to conversation

rockchip: rk3568-nanopi-r5: Drop duplicated/extra sdhci

PATCH In review Peter Robinson 2 participants 3 messages Dec 9, 2025 – Jul 20 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rockchip: rk3568-nanopi-r5: Drop duplicated/extra sdhci

The pinctrl settings are now upstream, with the upstream voltage supplies, and the HS200 mode is confirmed to work fine but the HS400 mode had reported issues so let's just consume what the upstream DT has now as it's all known good.

---
 arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi | 8 --------
 1 file changed, 8 deletions(-)
arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi +0 -8
index 64c43374c04..7e24be1a5e7 100644
@@ -12,14 +12,6 @@
 	/delete-property/ vpcie3v3-supply;
 };
 
-&sdhci {
-	cap-mmc-highspeed;
-	mmc-hs200-1_8v;
-	mmc-hs400-1_8v;
-	mmc-hs400-enhanced-strobe;
-	pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>;
-};
-
 &vcc5v0_usb_host {
 	/delete-property/ regulator-always-on;
 	/delete-property/ regulator-boot-on;
Signature · 1 line
2.52.0
Reviewed-by on v1 1/1
#1 lore raw

Hi Peter,

Quoted 17 lines · Peter Robinson

The pinctrl settings are now upstream, with the upstream voltage supplies, and the HS200 mode is confirmed to work fine but the HS400 mode had reported issues so let's just consume what the upstream DT has now as it's all known good.

---
  arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi | 8 --------
  1 file changed, 8 deletions(-)
arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi +0 -0
index 64c43374c04..7e24be1a5e7 100644

arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi line 16

Quoted 5 lines
arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi +0 -2
@@ -12,14 +12,6 @@
  	/delete-property/ vpcie3v3-supply;
  };
 
-&sdhci {
-	cap-mmc-highspeed;

I'm assuming this isn't "necessary" since we have HS200 enabled? It isn't part of the upstream Linux DTS.

Considering we have HS200 support enabled in both SPL and proper, it should be used, so:

Thanks!
Quentin

#2 lore raw

Hi Quentin,

Quoted 21 lines · Peter Robinson
Quoted 20 lines

The pinctrl settings are now upstream, with the upstream voltage supplies, and the HS200 mode is confirmed to work fine but the HS400 mode had reported issues so let's just consume what the upstream DT has now as it's all known good.

---
  arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi | 8 --------
  1 file changed, 8 deletions(-)
arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi +0 -0
index 64c43374c04..7e24be1a5e7 100644
@@ -12,14 +12,6 @@
      /delete-property/ vpcie3v3-supply;
  };
 
Quoted 5 lines

arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi line 16

Quoted 2 lines
arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi +0 -2
-&sdhci {
-     cap-mmc-highspeed;

I'm assuming this isn't "necessary" since we have HS200 enabled? It isn't part of the upstream Linux DTS.

Sorry, I read that as a statement, not a question. No, it's not necessary and I've got a few users that have been using this patch in Fedora without issues booting off eMMC for quite some time.

Quoted 2 lines

Considering we have HS200 support enabled in both SPL and proper, it should be used, so:

Ultimately if it's needed it should go upstream, but it doesn't appear to cause issues.

Quoted 4 lines

Thanks!
Quentin