Skip to contentSkip to conversation

MMC fixes for TI K3 platforms

PATCH Applied Judith Mendez 2 participants 9 messages Apr 23, 2024 – Apr 30, 2024

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

v3 cover MMC fixes for TI K3 platforms

This patch series includes MMC updates for various TI K3 platforms.

It includes support for enabling UHS/SDR104 bus modes.

For AM62ax, add missing UHS support.

For AM65x, fix ITAP delay and OTAP delay and clkbuf-sel properties in SDHCI nodes.

Changes since v2:
- Drop patch 6/6

Changes since v1:
- Drop patches that remove HS400 mode support
- Add patch 6/6

Bhavya Kapoor (1):
arm64: dts: ti: k3-j721s2-main: Enable support for SDR104 speed mode

Dasnavis Sabiya (1):
arm64: dts: ti: k3-j784s4-main: Enable support for UHS mode

Judith Mendez (2):
arm64: dts: ti: k3-am65-main: Fix sdhci node properties
arm64: dts: ti: k3-am65-main: Remove unused properties in sdhci nodes

Vignesh Raghavendra (1):
arm64: dts: ti: k3-am62a: Enable UHS mode support for SD cards

 arch/arm64/boot/dts/ti/k3-am62a-main.dtsi  |  2 --
 arch/arm64/boot/dts/ti/k3-am62a7-sk.dts    | 21 +++++++++++++++++
 arch/arm64/boot/dts/ti/k3-am65-main.dtsi   | 26 +++++++++-------------
 arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi |  2 --
 arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi |  2 --
 5 files changed, 32 insertions(+), 21 deletions(-)

base-commit: 534ad093bb80f19c20b251a89f09ce1a0e3d4f2d

Signature · 1 line
2.43.2
#1 lore raw

PATCH v3 1/5 arm64: dts: ti: k3-am65-main: Fix sdhci node properties

Update otap-del-sel properties as per datasheet [0].

Add missing clkbuf-sel and itap-del-sel values also as per datasheet [0].

Move clkbuf-sel and ti,trm-icp above the otap-del-sel properties so the sdhci nodes could be more uniform across platforms.

[0] https://www.ti.com/lit/ds/symlink/am6548.pdf

Fixes eac99d38f861 ("arm64: dts: ti: k3-am654-main: Update otap-del-sel values")
Fixes d7600d070fb0 ("arm64: dts: ti: k3-am65-main: Add support for sdhci1")

---
Changes since v2:
- no change

---
 arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/ti/k3-am65-main.dtsi +11 -6
index 670557c89f756..0803a8b9bfe84 100644
@@ -435,6 +435,8 @@ sdhci0: mmc@4f80000 {
 		interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>;
 		mmc-ddr-1_8v;
 		mmc-hs200-1_8v;
+		ti,clkbuf-sel = <0x7>;
+		ti,trm-icp = <0x8>;
 		ti,otap-del-sel-legacy = <0x0>;
 		ti,otap-del-sel-mmc-hs = <0x0>;
 		ti,otap-del-sel-sd-hs = <0x0>;
@@ -445,8 +447,7 @@ sdhci0: mmc@4f80000 {
 		ti,otap-del-sel-ddr50 = <0x5>;
 		ti,otap-del-sel-ddr52 = <0x5>;
 		ti,otap-del-sel-hs200 = <0x5>;
-		ti,otap-del-sel-hs400 = <0x0>;
-		ti,trm-icp = <0x8>;
+		ti,itap-del-sel-ddr52 = <0x0>;
 		dma-coherent;
 		status = "disabled";
 	};
@@ -458,18 +459,22 @@ sdhci1: mmc@4fa0000 {
 		clocks = <&k3_clks 48 0>, <&k3_clks 48 1>;
 		clock-names = "clk_ahb", "clk_xin";
 		interrupts = <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;
+		ti,clkbuf-sel = <0x7>;
+		ti,trm-icp = <0x8>;
 		ti,otap-del-sel-legacy = <0x0>;
 		ti,otap-del-sel-mmc-hs = <0x0>;
 		ti,otap-del-sel-sd-hs = <0x0>;
-		ti,otap-del-sel-sdr12 = <0x0>;
-		ti,otap-del-sel-sdr25 = <0x0>;
+		ti,otap-del-sel-sdr12 = <0xf>;
+		ti,otap-del-sel-sdr25 = <0xf>;
 		ti,otap-del-sel-sdr50 = <0x8>;
 		ti,otap-del-sel-sdr104 = <0x7>;
 		ti,otap-del-sel-ddr50 = <0x4>;
 		ti,otap-del-sel-ddr52 = <0x4>;
 		ti,otap-del-sel-hs200 = <0x7>;
-		ti,clkbuf-sel = <0x7>;
-		ti,trm-icp = <0x8>;
+		ti,itap-del-sel-legacy = <0xa>;
+		ti,itap-del-sel-sd-hs = <0x1>;
+		ti,itap-del-sel-sdr12 = <0xa>;
+		ti,itap-del-sel-sdr25 = <0x1>;
 		dma-coherent;
 		status = "disabled";
 	};
Signature · 1 line
2.43.2
#2 lore raw

PATCH v3 2/5 arm64: dts: ti: k3-am65-main: Remove unused properties in sdhci nodes

In reply to Judith Mendez

On AM65x platform, sdhci0 is for eMMC and sdhci1 is for SD. Remove the properties that are not applicable for each device.

Fixes eac99d38f861 ("arm64: dts: ti: k3-am654-main: Update otap-del-sel values")
Fixes d7600d070fb0 ("arm64: dts: ti: k3-am65-main: Add support for sdhci1")

---
Changes since v2:
- no change

---
 arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 9 ---------
 1 file changed, 9 deletions(-)
arch/arm64/boot/dts/ti/k3-am65-main.dtsi +0 -9
index 0803a8b9bfe84..127f581a56bc6 100644
@@ -439,12 +439,6 @@ sdhci0: mmc@4f80000 {
 		ti,trm-icp = <0x8>;
 		ti,otap-del-sel-legacy = <0x0>;
 		ti,otap-del-sel-mmc-hs = <0x0>;
-		ti,otap-del-sel-sd-hs = <0x0>;
-		ti,otap-del-sel-sdr12 = <0x0>;
-		ti,otap-del-sel-sdr25 = <0x0>;
-		ti,otap-del-sel-sdr50 = <0x8>;
-		ti,otap-del-sel-sdr104 = <0x7>;
-		ti,otap-del-sel-ddr50 = <0x5>;
 		ti,otap-del-sel-ddr52 = <0x5>;
 		ti,otap-del-sel-hs200 = <0x5>;
 		ti,itap-del-sel-ddr52 = <0x0>;
@@ -462,15 +456,12 @@ sdhci1: mmc@4fa0000 {
 		ti,clkbuf-sel = <0x7>;
 		ti,trm-icp = <0x8>;
 		ti,otap-del-sel-legacy = <0x0>;
-		ti,otap-del-sel-mmc-hs = <0x0>;
 		ti,otap-del-sel-sd-hs = <0x0>;
 		ti,otap-del-sel-sdr12 = <0xf>;
 		ti,otap-del-sel-sdr25 = <0xf>;
 		ti,otap-del-sel-sdr50 = <0x8>;
 		ti,otap-del-sel-sdr104 = <0x7>;
 		ti,otap-del-sel-ddr50 = <0x4>;
-		ti,otap-del-sel-ddr52 = <0x4>;
-		ti,otap-del-sel-hs200 = <0x7>;
 		ti,itap-del-sel-legacy = <0xa>;
 		ti,itap-del-sel-sd-hs = <0x1>;
 		ti,itap-del-sel-sdr12 = <0xa>;
Signature · 1 line
2.43.2
#3 lore raw

PATCH v3 3/5 arm64: dts: ti: k3-am62a: Enable UHS mode support for SD cards

In reply to Judith Mendez

From: Vignesh Raghavendra <[email protected]>

Hook up required IO voltage regulators and drop no-1-8-v to support UHS modes on SD cards.

Fixes 5fc6b1b62639 ("arm64: dts: ti: Introduce AM62A7 family of SoCs")

[Judith: Remove no-1-8-v for sdhci2, keep otap-del-sel-legacy=0, add fixes tag, reword commit]

---
Changes since v2:
- no change

---
 arch/arm64/boot/dts/ti/k3-am62a-main.dtsi |  2 --
 arch/arm64/boot/dts/ti/k3-am62a7-sk.dts   | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/ti/k3-am62a-main.dtsi +0 -2
index aa1e057082f08..6652701d3e3b8 100644
@@ -573,7 +573,6 @@ sdhci1: mmc@fa00000 {
 		ti,itap-del-sel-sd-hs = <0x0>;
 		ti,itap-del-sel-sdr12 = <0x0>;
 		ti,itap-del-sel-sdr25 = <0x0>;
-		no-1-8-v;
 		status = "disabled";
 	};
 
@@ -597,7 +596,6 @@ sdhci2: mmc@fa20000 {
 		ti,itap-del-sel-sd-hs = <0x0>;
 		ti,itap-del-sel-sdr12 = <0x0>;
 		ti,itap-del-sel-sdr25 = <0x0>;
-		no-1-8-v;
 		status = "disabled";
 	};
 
arch/arm64/boot/dts/ti/k3-am62a7-sk.dts +21 -0
index f241637a5642a..fa43cd0b631e6 100644
@@ -113,6 +113,20 @@ vcc_3v3_sys: regulator-4 {
 		regulator-boot-on;
 	};
 
+	vddshv_sdio: regulator-5 {
+		compatible = "regulator-gpio";
+		regulator-name = "vddshv_sdio";
+		pinctrl-names = "default";
+		pinctrl-0 = <&vddshv_sdio_pins_default>;
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-boot-on;
+		vin-supply = <&ldo1>;
+		gpios = <&main_gpio0 31 GPIO_ACTIVE_HIGH>;
+		states = <1800000 0x0>,
+			 <3300000 0x1>;
+	};
+
 	leds {
 		compatible = "gpio-leds";
 		pinctrl-names = "default";
@@ -342,6 +356,12 @@ main_gpio1_ioexp_intr_pins_default: main-gpio1-ioexp-intr-default-pins {
 			AM62AX_IOPAD(0x01d4, PIN_INPUT, 7) /* (C15) UART0_RTSn.GPIO1_23 */
 		>;
 	};
+
+	vddshv_sdio_pins_default: vddshv-sdio-default-pins {
+		pinctrl-single,pins = <
+			AM62AX_IOPAD(0x07c, PIN_OUTPUT, 7) /* (M19) GPMC0_CLK.GPIO0_31 */
+		>;
+	};
 };
 
 &mcu_pmx0 {
@@ -580,6 +600,7 @@ &sdhci1 {
 	/* SD/MMC */
 	status = "okay";
 	vmmc-supply = <&vdd_mmc1>;
+	vqmmc-supply = <&vddshv_sdio>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&main_mmc1_pins_default>;
 	disable-wp;
Signature · 1 line
2.43.2
#4 lore raw

PATCH v3 4/5 arm64: dts: ti: k3-j721s2-main: Enable support for SDR104 speed mode

In reply to Judith Mendez

From: Bhavya Kapoor <[email protected]>

According to TRM for J721S2, SDR104 speed mode is supported by the SoC but its capabilities were masked in device tree. Remove sdhci-caps-mask to enable support for SDR104 speed mode for SD card in J721S2 SoC.

[+] Refer to : section 12.3.6.1.1 MMCSD Features, in J721S2 TRM
- https://www.ti.com/lit/zip/spruj28

Fixes b8545f9d3a54 ("arm64: dts: ti: Add initial support for J721S2 SoC")

---
Changes since v2:
- no change

---
 arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 2 --
 1 file changed, 2 deletions(-)
arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi +0 -2
index 3cb06a7e4117f..9ed6949b40e9d 100644
@@ -768,8 +768,6 @@ main_sdhci1: mmc@4fb0000 {
 		ti,clkbuf-sel = <0x7>;
 		ti,trm-icp = <0x8>;
 		dma-coherent;
-		/* Masking support for SDR104 capability */
-		sdhci-caps-mask = <0x00000003 0x00000000>;
 		status = "disabled";
 	};
 
Signature · 1 line
2.43.2
#5 lore raw

PATCH v3 5/5 arm64: dts: ti: k3-j784s4-main: Enable support for UHS mode

In reply to Judith Mendez

From: Dasnavis Sabiya <[email protected]>

Remove sdhci-caps-mask to enable support for SDR104 speed mode for SD card and remove no-1-8-v property so that SD card can work in any UHS-1 high speed mode it can support.

Fixes 4664ebd8346a ("arm64: dts: ti: Add initial support for J784S4 SoC")
[Judith: Add fixes tag]

---
Changes since v2:
- no change

---
 arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 2 --
 1 file changed, 2 deletions(-)
arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi +0 -2
index d42f25cacf23d..6a4554c6c9c13 100644
@@ -904,8 +904,6 @@ main_sdhci1: mmc@4fb0000 {
 		ti,clkbuf-sel = <0x7>;
 		ti,trm-icp = <0x8>;
 		dma-coherent;
-		sdhci-caps-mask = <0x00000003 0x00000000>;
-		no-1-8-v;
 		status = "disabled";
 	};
 
Signature · 1 line
2.43.2
maintainer Applied
#6 lore raw
In reply to Judith Mendez

Hi Judith Mendez,

Quoted 10 lines · Judith Mendez

This patch series includes MMC updates for various TI K3 platforms.

It includes support for enabling UHS/SDR104 bus modes.

For AM62ax, add missing UHS support.

For AM65x, fix ITAP delay and OTAP delay and clkbuf-sel properties in SDHCI nodes.

[...]

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

[1/5] arm64: dts: ti: k3-am65-main: Fix sdhci node properties

      commit: 9853d5fc6b33d77de20308a9facf1ac0b4ac3347
[2/5] arm64: dts: ti: k3-am65-main: Remove unused properties in sdhci nodes
      commit: 0c6ad2fed244c393e8c19edafde324a01b7d8c1b
[3/5] arm64: dts: ti: k3-am62a: Enable UHS mode support for SD cards
      commit: 8fea8069313c3a77e075a353edbc5b212e07303c
[4/5] arm64: dts: ti: k3-j721s2-main: Enable support for SDR104 speed mode
      commit: 7e484938110c00e9d27413e04200ffa94ec16b55
[5/5] arm64: dts: ti: k3-j784s4-main: Enable support for UHS mode
      commit: 2396b640f82da528bc3fcbcfdbd240091ff405e1

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
#7 lore raw
In reply to Judith Mendez
Quoted 8 lines · Judith Mendez

This patch series includes MMC updates for various TI K3 platforms.

It includes support for enabling UHS/SDR104 bus modes.

For AM62ax, add missing UHS support.

For AM65x, fix ITAP delay and OTAP delay and clkbuf-sel properties in SDHCI nodes.

Please do not merge this series, will send a update v4.

~ Judith

maintainer
#8 lore raw
Quoted 11 lines · Judith Mendez
Quoted 8 lines · Judith Mendez

This patch series includes MMC updates for various TI K3 platforms.

It includes support for enabling UHS/SDR104 bus modes.

For AM62ax, add missing UHS support.

For AM65x, fix ITAP delay and OTAP delay and clkbuf-sel properties in SDHCI nodes.

Please do not merge this series, will send a update v4.

Judith: after discussing offline, I do not see a problem with the series. The defconfig patch can be send separately (probably next cycle) - you do not really need to resubmit the complete series again.
- for current users initrd isn't broken anyways.

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