Skip to contentSkip to conversation

Misc MMC updates

PATCH Applied Judith Mendez 2 participants 5 messages Apr 29, 2025 – May 2, 2025

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v3 cover Misc MMC updates

This patch series includes updates for eMMC and SD nodes across Sitara K3 SoC boards:

Add boot phase flag to MMC nodes and dependency nodes to support SD and eMMC boot.
Add non-removable flag to eMMC nodes to void having to redetect eMMC after suspend/resume.
Remove disable-wp for eMMC nodes since property is specific to SD.

Changes since v2:
- Split out patches meant for stable
- add review tags

Link to v2:
https://lore.kernel.org/linux-devicetree/[email protected]/
Link to v1:
https://lore.kernel.org/linux-devicetree/[email protected]/

Judith Mendez (3):
arm64: dts: ti: k3-am6*: Add boot phase flag to support MMC boot
arm64: dts: ti: k3-am62*: Add non-removable flag for eMMC
arm64: dts: ti: k3-am6*: Remove disable-wp for eMMC

 arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts             | 12 ++++++++++++
 arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi      |  1 -
 arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts       |  2 +-
 arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi     |  1 -
 arch/arm64/boot/dts/ti/k3-am62a7-sk.dts              |  3 ++-
 arch/arm64/boot/dts/ti/k3-am62p5-sk.dts              |  2 +-
 arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi       |  2 +-
 arch/arm64/boot/dts/ti/k3-am642-evm.dts              |  1 -
 arch/arm64/boot/dts/ti/k3-am654-base-board.dts       |  1 -
 .../dts/ti/k3-am6548-iot2050-advanced-common.dtsi    |  1 -
 arch/arm64/boot/dts/ti/k3-am69-sk.dts                |  1 -
 11 files changed, 17 insertions(+), 10 deletions(-)

base-commit: d864bb528a6725e775d564fd4430762acbb9dd0d

Signature · 1 line
2.49.0
#1 lore raw

PATCH v3 1/3 arm64: dts: ti: k3-am6*: Add boot phase flag to support MMC boot

The bootph-all flag was introduced in dt-schema (dtschema/schemas/bootph.yaml) to define node usage across different boot phases.

For eMMC and SD boot modes, voltage regulator nodes, io-expander nodes, gpio nodes, and MMC nodes need to be present in all boot stages, so add missing bootph-all phase flag to these nodes to support SD boot and eMMC boot.

---
 arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts | 12 ++++++++++++
 arch/arm64/boot/dts/ti/k3-am62a7-sk.dts  |  2 ++
 2 files changed, 14 insertions(+)
arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts +12 -0
index 8e9fc00a6b3c..aafdb90c0eb7 100644
@@ -69,6 +69,7 @@ vddshv_sdio: regulator-4 {
 		gpios = <&main_gpio0 31 GPIO_ACTIVE_HIGH>;
 		states = <1800000 0x0>,
 			 <3300000 0x1>;
+		bootph-all;
 	};
 };
 
@@ -77,12 +78,14 @@ vddshv_sdio_pins_default: vddshv-sdio-default-pins {
 		pinctrl-single,pins = <
 			AM62X_IOPAD(0x07c, PIN_OUTPUT, 7) /* (M19) GPMC0_CLK.GPIO0_31 */
 		>;
+		bootph-all;
 	};
 
 	main_gpio1_ioexp_intr_pins_default: main-gpio1-ioexp-intr-default-pins {
 		pinctrl-single,pins = <
 			AM62X_IOPAD(0x01d4, PIN_INPUT, 7) /* (C13) UART0_RTSn.GPIO1_23 */
 		>;
+		bootph-all;
 	};
 
 	pmic_irq_pins_default: pmic-irq-default-pins {
@@ -118,6 +121,7 @@ exp1: gpio@22 {
 
 		pinctrl-names = "default";
 		pinctrl-0 = <&main_gpio1_ioexp_intr_pins_default>;
+		bootph-all;
 	};
 
 	exp2: gpio@23 {
@@ -229,6 +233,14 @@ &tlv320aic3106 {
 	DVDD-supply = <&buck2_reg>;
 };
 
+&main_gpio0 {
+	bootph-all;
+};
+
+&main_gpio1 {
+	bootph-all;
+};
+
 &gpmc0 {
 	ranges = <0 0 0x00 0x51000000 0x01000000>; /* CS0 space. Min partition = 16MB */
 };
arch/arm64/boot/dts/ti/k3-am62a7-sk.dts +2 -0
index a9557ee73b83..22be41d46eb5 100644
@@ -313,6 +313,7 @@ AM62AX_IOPAD(0x200, PIN_INPUT_PULLUP, 0) /* (AC1) MMC0_DAT5 */
 			AM62AX_IOPAD(0x1fc, PIN_INPUT_PULLUP, 0) /* (AD2) MMC0_DAT6 */
 			AM62AX_IOPAD(0x1f8, PIN_INPUT_PULLUP, 0) /* (AC2) MMC0_DAT7 */
 		>;
+		bootph-all;
 	};
 
 	main_mmc1_pins_default: main-mmc1-default-pins {
@@ -634,6 +635,7 @@ &sdhci0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&main_mmc0_pins_default>;
 	disable-wp;
+	bootph-all;
 };
 
 &sdhci1 {
Signature · 1 line
2.49.0
#2 lore raw

PATCH v3 2/3 arm64: dts: ti: k3-am62*: Add non-removable flag for eMMC

In reply to Judith Mendez

EMMC device is non-removable so add 'non-removable' DT property to avoid having to redetect the eMMC after suspend/resume.

---
 arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 1 +
 arch/arm64/boot/dts/ti/k3-am62p5-sk.dts        | 1 +
 arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 1 +
 3 files changed, 3 insertions(+)
arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts +1 -0
index a5469f2712f0..1c8b4d13fb49 100644
@@ -832,6 +832,7 @@ &main_spi2 {
 
 &sdhci0 {
 	bootph-all;
+	non-removable;
 	pinctrl-names = "default";
 	pinctrl-0 = <&emmc_pins_default>;
 	disable-wp;
arch/arm64/boot/dts/ti/k3-am62p5-sk.dts +1 -0
index c2f55cc5a8eb..ab06cc42b4f2 100644
@@ -480,6 +480,7 @@ &main_i2c2 {
 
 &sdhci0 {
 	status = "okay";
+	non-removable;
 	ti,driver-strength-ohm = <50>;
 	disable-wp;
 	bootph-all;
arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi +1 -0
index 20d1437f253d..7d249fd04561 100644
@@ -453,6 +453,7 @@ &main_i2c2 {
 &sdhci0 {
 	bootph-all;
 	status = "okay";
+	non-removable;
 	pinctrl-names = "default";
 	pinctrl-0 = <&main_mmc0_pins_default>;
 	disable-wp;
Signature · 1 line
2.49.0
#3 lore raw

PATCH v3 3/3 arm64: dts: ti: k3-am6*: Remove disable-wp for eMMC

In reply to Judith Mendez

Remove disable-wp flag for eMMC nodes since this flag is only applicable to SD according to the binding doc (mmc/mmc-controller-common.yaml).

For eMMC, this flag should be ignored but lets remove anyways to cleanup sdhci nodes.

---
 arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi               | 1 -
 arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts                | 1 -
 arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi              | 1 -
 arch/arm64/boot/dts/ti/k3-am62a7-sk.dts                       | 1 -
 arch/arm64/boot/dts/ti/k3-am62p5-sk.dts                       | 1 -
 arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi                | 1 -
 arch/arm64/boot/dts/ti/k3-am642-evm.dts                       | 1 -
 arch/arm64/boot/dts/ti/k3-am654-base-board.dts                | 1 -
 arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi | 1 -
 arch/arm64/boot/dts/ti/k3-am69-sk.dts                         | 1 -
 10 files changed, 10 deletions(-)
arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi +0 -1
index 55ed418c023b..e5be92aa1218 100644
@@ -381,7 +381,6 @@ serial_flash: flash@0 {
 &sdhci0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&main_mmc0_pins_default>;
-	disable-wp;
 	non-removable;
 	bootph-all;
 	status = "okay";
arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts +0 -1
index 1c8b4d13fb49..72b09f9c69d8 100644
@@ -835,7 +835,6 @@ &sdhci0 {
 	non-removable;
 	pinctrl-names = "default";
 	pinctrl-0 = <&emmc_pins_default>;
-	disable-wp;
 	status = "okay";
 };
 
arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi +0 -1
index 147d56b87984..0d4115590b9c 100644
@@ -338,7 +338,6 @@ serial_flash: flash@0 {
 &sdhci0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&main_mmc0_pins_default>;
-	disable-wp;
 	non-removable;
 	bootph-all;
 	status = "okay";
arch/arm64/boot/dts/ti/k3-am62a7-sk.dts +0 -1
index 22be41d46eb5..c65ada5a22ab 100644
@@ -634,7 +634,6 @@ &sdhci0 {
 	non-removable;
 	pinctrl-names = "default";
 	pinctrl-0 = <&main_mmc0_pins_default>;
-	disable-wp;
 	bootph-all;
 };
 
arch/arm64/boot/dts/ti/k3-am62p5-sk.dts +0 -1
index ab06cc42b4f2..b89b7a779bcc 100644
@@ -482,7 +482,6 @@ &sdhci0 {
 	status = "okay";
 	non-removable;
 	ti,driver-strength-ohm = <50>;
-	disable-wp;
 	bootph-all;
 };
 
arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi +0 -1
index 7d249fd04561..c6c8a9d17fb5 100644
@@ -456,7 +456,6 @@ &sdhci0 {
 	non-removable;
 	pinctrl-names = "default";
 	pinctrl-0 = <&main_mmc0_pins_default>;
-	disable-wp;
 };
 
 &sdhci1 {
arch/arm64/boot/dts/ti/k3-am642-evm.dts +0 -1
index f8ec40523254..5c6197ba842e 100644
@@ -597,7 +597,6 @@ &sdhci0 {
 	status = "okay";
 	non-removable;
 	ti,driver-strength-ohm = <50>;
-	disable-wp;
 	bootph-all;
 };
 
arch/arm64/boot/dts/ti/k3-am654-base-board.dts +0 -1
index aa7139cc8a92..c30425960398 100644
@@ -456,7 +456,6 @@ &sdhci0 {
 	bus-width = <8>;
 	non-removable;
 	ti,driver-strength-ohm = <50>;
-	disable-wp;
 };
 
 /*
arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi +0 -1
index ae842b85b70d..12af6cb7f65c 100644
@@ -50,5 +50,4 @@ &sdhci0 {
 	bus-width = <8>;
 	non-removable;
 	ti,driver-strength-ohm = <50>;
-	disable-wp;
 };
arch/arm64/boot/dts/ti/k3-am69-sk.dts +0 -1
index b85227052f97..f28375629739 100644
@@ -940,7 +940,6 @@ &main_sdhci0 {
 	status = "okay";
 	non-removable;
 	ti,driver-strength-ohm = <50>;
-	disable-wp;
 };
 
 &main_sdhci1 {
Signature · 1 line
2.49.0
maintainer Applied
#4 lore raw
In reply to Judith Mendez

Hi Judith Mendez,

Quoted 10 lines · Judith Mendez

This patch series includes updates for eMMC and SD nodes across Sitara K3 SoC boards:

Add boot phase flag to MMC nodes and dependency nodes to support SD and eMMC boot.
Add non-removable flag to eMMC nodes to void having to redetect eMMC after suspend/resume.
Remove disable-wp for eMMC nodes since property is specific to SD.

[...]

I have applied the following to branch ti-k3-dts-next on [1]. Thank you!

[1/3] arm64: dts: ti: k3-am6*: Add boot phase flag to support MMC boot

      commit: db3cd905b8c8cd40f15a34e30a225704bb8a2fcb
[2/3] arm64: dts: ti: k3-am62*: Add non-removable flag for eMMC
      commit: d16e7d34352c4107a81888e9aab4ea4748076e70
[3/3] arm64: dts: ti: k3-am6*: Remove disable-wp for eMMC
      commit: ef839ba8142f14513ba396a033110526b7008096

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent up the chain during the next merge window (or sooner if it is a relevant bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git

Signature · 3 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D