Skip to contentSkip to conversation

MMC updates for TI K3 platforms

PATCH Superseded Judith Mendez 2 participants 9 messages Apr 16, 2024 – Apr 22, 2024

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 cover MMC updates 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.

Lastly, change TPS6593x PMIC driver to built-in since booting SD with UHS modes have a dependency on the driver.

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

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

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 (3):
arm64: dts: ti: k3-am65-main: Update sdhci properties
arm64: dts: ti: k3-am65-main: Remove unused properties in sdhci nodes
arm64: defconfig: Set CONFIG_MFD_TPS6594_I2C=y

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 --
 arch/arm64/configs/defconfig               |  2 +-
 6 files changed, 33 insertions(+), 22 deletions(-)

base-commit: 534ad093bb80f19c20b251a89f09ce1a0e3d4f2d

Signature · 1 line
2.43.2
#1 lore raw

PATCH v2 1/6 arm64: dts: ti: k3-am65-main: Update sdhci 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 v1:
- 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 v2 2/6 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 v1:
- 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 v2 3/6 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 v1:
- 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 v2 4/6 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 v1:
- 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 v2 5/6 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 v1:
- 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
#6 lore raw

PATCH v2 6/6 arm64: defconfig: Set CONFIG_MFD_TPS6594_I2C=y

In reply to Judith Mendez

SK-AM62A-LP uses TPS6593x PMIC (interfaced over I2C) to power the SoC and various other peripherals on the board [1].

Booting SD with UHS modes have a dependency on TPS6593x PMIC driver so change to built in order to boot using SD boot at the higher speed modes.

Fixes f9010eb938be ("arm64: defconfig: Enable TPS6593 PMIC for SK-AM62A")

---
Changes since v1:
- Add patch 6/6

---
 arch/arm64/configs/defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/configs/defconfig +1 -1
index 2c30d617e1802..c994ba7b682dd 100644
@@ -741,7 +741,7 @@ CONFIG_MFD_SL28CPLD=y
 CONFIG_RZ_MTU3=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_MFD_TPS65219=y
-CONFIG_MFD_TPS6594_I2C=m
+CONFIG_MFD_TPS6594_I2C=y
 CONFIG_MFD_ROHM_BD718XX=y
 CONFIG_MFD_WCD934X=m
 CONFIG_MFD_KHADAS_MCU=m
Signature · 1 line
2.43.2
#7 lore raw

Re: [PATCH v2 6/6] arm64: defconfig: Set CONFIG_MFD_TPS6594_I2C=y

Quoted 7 lines · Judith Mendez

SK-AM62A-LP uses TPS6593x PMIC (interfaced over I2C) to power the SoC and various other peripherals on the board [1].

Booting SD with UHS modes have a dependency on TPS6593x PMIC driver so change to built in order to boot using SD boot at the higher speed modes.

Fixes f9010eb938be ("arm64: defconfig: Enable TPS6593 PMIC for SK-AM62A")

No, that's not a fix. Fix is using proper initramfs, because bug is lack of initramfs, not having it as module.

I don't agree, because I prefer to have this as module.

Quoted 1 line

Best regards,
Krzysztof

#8 lore raw

Re: [PATCH v2 6/6] arm64: defconfig: Set CONFIG_MFD_TPS6594_I2C=y

Hi,

Quoted 7 lines · Krzysztof Kozlowski
Quoted 6 lines · Judith Mendez

SK-AM62A-LP uses TPS6593x PMIC (interfaced over I2C) to power the SoC and various other peripherals on the board [1].

Booting SD with UHS modes have a dependency on TPS6593x PMIC driver so change to built in order to boot using SD boot at the higher speed modes.

Quoted 6 lines
Quoted 1 line
Fixes f9010eb938be ("arm64: defconfig: Enable TPS6593 PMIC for SK-AM62A")

No, that's not a fix. Fix is using proper initramfs, because bug is lack of initramfs, not having it as module.

I don't agree, because I prefer to have this as module.

ok, will drop this patch, thanks.

~ Judith

Quoted 7 lines
Quoted 2 lines

Best regards,
Krzysztof