Skip to contentSkip to conversation

arm: dts: socfpga: agilex5: Improve MMC/SD device tree organization

PATCH Superseded [email protected] 1 participant 3 messages Apr 15 Arm (32-bit)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover arm: dts: socfpga: agilex5: Improve MMC/SD device tree organization

From: tzeyeeng <[email protected]>

This patch series refactors the MMC/SD device tree configuration for Agilex5 SOCDK to improve maintainability and correctness.

The first patch reorganizes the configuration by moving board-specific MMC properties from the common u-boot.dtsi to the board-specific dts file, keeping only truly common configurations in the shared dtsi.

The second patch addresses a configuration issue where the eMMC device tree was incorrectly inheriting SD card-specific properties. It removes the SD UHS speed mode properties (sd-uhs-sdr50, sd-uhs-sdr104) that are not applicable to eMMC and properly configures the capabilities mask to enable 8-bit embedded device support.

tzeyeeng (2):
arm: dts: socfpga: agilex5: Move mmc node differs from base board dtsi
to dts
arm: dts: socfpga: Remove SD card properties from Agilex5 eMMC device
tree

 arch/arm/dts/socfpga_agilex5_socdk-u-boot.dtsi | 1 -
 arch/arm/dts/socfpga_agilex5_socdk.dts         | 6 ++++++
 arch/arm/dts/socfpga_agilex5_socdk_emmc.dts    | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)
Signature · 1 line
2.43.7
#1 lore raw

PATCH 1/2 arm: dts: socfpga: agilex5: Move mmc node differs from base board dtsi to dts

From: tzeyeeng <[email protected]>

The purpose of this change is to keep common configuration in socfpga_agilex5_socdk-u-boot.dtsi and move differs to socfpga_agilex5_socdk.dts.

---
 arch/arm/dts/socfpga_agilex5_socdk-u-boot.dtsi | 1 -
 arch/arm/dts/socfpga_agilex5_socdk.dts         | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)
arch/arm/dts/socfpga_agilex5_socdk-u-boot.dtsi +0 -1
index c03f78b2fdf..23c616b1afd 100644
@@ -118,7 +118,6 @@
 	vqmmc-supply = <&sd_io_1v8_reg>;
 	max-frequency = <200000000>;
 	sdhci-caps = <0x00000000 0x0000c800>;
-	sdhci-caps-mask = <0x00002000 0x0000ff00>;
 
 	/* SD card default speed (DS) and UHS-I SDR12 mode timing configuration */
 	cdns,phy-dqs-timing-delay-sd-ds = <0x00780000>;
arch/arm/dts/socfpga_agilex5_socdk.dts +6 -0
index 886cc89fdb6..cbb2bfbe3b4 100644
@@ -74,6 +74,12 @@
 	status = "okay";
 };
 
+&mmc {
+	sd-uhs-sdr50;
+	sd-uhs-sdr104;
+	sdhci-caps-mask = <0x00002000 0x0000ff00>;
+};
+
 &uart0 {
 	status = "okay";
 };
Signature · 1 line
2.43.7
#2 lore raw

PATCH 2/2 arm: dts: socfpga: Remove SD card properties from Agilex5 eMMC device tree

In reply to [email protected]

From: tzeyeeng <[email protected]>

eMMC inherit the configuration from socfpga_agilex5_socdk.dts, including the SD card properties.

Changes:
- Remove sd-uhs-sdr50 and sd-uhs-sdr104, which are SD card speed mode from eMMC device tree.
- Set SDHCI Capabilities bit18 to enable 8-bit embedded device support.

---
 arch/arm/dts/socfpga_agilex5_socdk_emmc.dts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/dts/socfpga_agilex5_socdk_emmc.dts +3 -1
index c06781064ca..f1e8b737e3f 100644
@@ -18,6 +18,8 @@
 };
 
 &mmc {
+	/delete-property/ sd-uhs-sdr50;
+	/delete-property/ sd-uhs-sdr104;
 	status = "okay";
 
 	no-sd;
@@ -32,7 +34,7 @@
 	vqmmc-supply = <&emmc_io_1v8_reg>;
 	max-frequency = <200000000>;
 	sdhci-caps = <0x00000000 0x0004c800>;	/* SDHCI_CAN_DO_8BIT */
-	sdhci-caps-mask = <0x00000000 0x0000ff00>;
+	sdhci-caps-mask = <0x00000000 0x0004ff00>;
 
 	/* eMMC legacy mode timing configuration */
 	cdns,phy-dqs-timing-delay-sd-ds = <0x00780000>;
Signature · 1 line
2.43.7