Skip to contentSkip to conversation

Add support for MMC/SD on j7200-evm

PATCH Applied Faiz Abbas 4 participants 6 messages Sep 24, 2020

Subsystems (2)
lore
Share & tools
lore

Faiz Abbas

author
#0 lore raw

v2 cover Add support for MMC/SD on j7200-evm

The following patches add dt support for MMC/SD on TI's j7200-evm.

Currently, eMMC support upto HS200 speed and SD card supports upto high speed speed mode.

v2:
Fixed node names to use mmc@* format
Fixed reg address format to align with others in the file

Faiz Abbas (2):
arm64: dts: ti: k3-j7200-main: Add support for MMC/SD controller nodes
arm64: dts: ti: k3-j7200-common-proc-board: Add support for eMMC and
SD card

 .../dts/ti/k3-j7200-common-proc-board.dts     | 28 ++++++++++++++
 arch/arm64/boot/dts/ti/k3-j7200-main.dtsi     | 37 +++++++++++++++++++
 2 files changed, 65 insertions(+)
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH v2 1/2 arm64: dts: ti: k3-j7200-main: Add support for MMC/SD controller nodes

Add support for MMC/SD controller nodes present on TI's j7200 SoCs.

There are two nodes:
1. sdhci0 (8 bit bus width, 200 MHz, HS200, 200 MBps)
2. sdhci1 (4 bit bus width, 50 MHz, HS, 25 MBps)

---
 arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 37 +++++++++++++++++++++++
 1 file changed, 37 insertions(+)
arch/arm64/boot/dts/ti/k3-j7200-main.dtsi +37 -0
index f44f0b83d12a..e613f5d94281 100644
@@ -310,4 +310,41 @@
 		clocks = <&k3_clks 193 1>;
 		power-domains = <&k3_pds 193 TI_SCI_PD_EXCLUSIVE>;
 	};
+
+	main_sdhci0: mmc@4f80000 {
+		compatible = "ti,j7200-sdhci-8bit", "ti,j721e-sdhci-8bit";
+		reg = <0x00 0x04f80000 0x00 0x260>, <0x00 0x4f88000 0x00 0x134>;
+		interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
+		power-domains = <&k3_pds 91 TI_SCI_PD_EXCLUSIVE>;
+		clock-names = "clk_xin", "clk_ahb";
+		clocks = <&k3_clks 91 3>, <&k3_clks 91 0>;
+		ti,otap-del-sel-legacy = <0x0>;
+		ti,otap-del-sel-mmc-hs = <0x0>;
+		ti,otap-del-sel-ddr52 = <0x6>;
+		ti,otap-del-sel-hs200 = <0x8>;
+		ti,otap-del-sel-hs400 = <0x0>;
+		ti,strobe-sel = <0x77>;
+		ti,trm-icp = <0x8>;
+		bus-width = <8>;
+		mmc-ddr-1_8v;
+		dma-coherent;
+	};
+
+	main_sdhci1: mmc@4fb0000 {
+		compatible = "ti,j7200-sdhci-4bit", "ti,j721e-sdhci-4bit";
+		reg = <0x00 0x04fb0000 0x00 0x260>, <0x00 0x4fb8000 0x00 0x134>;
+		interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
+		power-domains = <&k3_pds 92 TI_SCI_PD_EXCLUSIVE>;
+		clock-names = "clk_xin", "clk_ahb";
+		clocks = <&k3_clks 92 2>, <&k3_clks 92 1>;
+		ti,otap-del-sel-legacy = <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 = <0xc>;
+		ti,otap-del-sel-sdr104 = <0x5>;
+		ti,otap-del-sel-ddr50 = <0xc>;
+		no-1-8-v;
+		dma-coherent;
+	};
 };
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH v2 2/2 arm64: dts: ti: k3-j7200-common-proc-board: Add support for eMMC and SD card

In reply to Faiz Abbas

Add support for the eMMC and SD card connected on the common processor board

sdhci0 is connected to an eMMC while sdhci1 is connected to the micro SD slot.

---
 .../dts/ti/k3-j7200-common-proc-board.dts     | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts +28 -0
index 03c8817e8745..794241ba74cb 100644
@@ -28,6 +28,19 @@
 			J721E_IOPAD(0xe0, PIN_INPUT_PULLUP, 3) /* (T3) EXT_REFCLK1.I2C1_SDA */
 		>;
 	};
+
+	main_mmc1_pins_default: main-mmc1-pins-default {
+		pinctrl-single,pins = <
+			J721E_IOPAD(0x104, PIN_INPUT, 0) /* (M20) MMC1_CMD */
+			J721E_IOPAD(0x100, PIN_INPUT, 0) /* (P21) MMC1_CLK */
+			J721E_IOPAD(0xfc, PIN_INPUT, 0) /* (P25) MMC1_CLKLB */
+			J721E_IOPAD(0xf8, PIN_INPUT, 0) /* (M19) MMC1_DAT0 */
+			J721E_IOPAD(0xf4, PIN_INPUT, 0) /* (N21) MMC1_DAT1 */
+			J721E_IOPAD(0xf0, PIN_INPUT, 0) /* (N20) MMC1_DAT2 */
+			J721E_IOPAD(0xec, PIN_INPUT, 0) /* (N19) MMC1_DAT3 */
+			J721E_IOPAD(0xe4, PIN_INPUT, 8) /* (V1) TIMER_IO0.MMC1_SDCD */
+		>;
+	};
 };
 
 &wkup_uart0 {
@@ -112,3 +125,18 @@
 		#gpio-cells = <2>;
 	};
 };
+
+&main_sdhci0 {
+	/* eMMC */
+	non-removable;
+	ti,driver-strength-ohm = <50>;
+	disable-wp;
+};
+
+&main_sdhci1 {
+	/* SD card */
+	pinctrl-0 = <&main_mmc1_pins_default>;
+	pinctrl-names = "default";
+	ti,driver-strength-ohm = <50>;
+	disable-wp;
+};
Signature · 1 line
2.17.1
Reviewed-by on the v2 series
#3 lore raw
In reply to Faiz Abbas
Quoted 4 lines · Faiz Abbas

The following patches add dt support for MMC/SD on TI's j7200-evm.

Currently, eMMC support upto HS200 speed and SD card supports upto high speed speed mode.

To be sure, the TRM calls for SD card speed up to DDR50. And I believe there is work going on to go higher too. That needs voltage switching though and can come in as follow-on patches. This is good first step.

Thanks,
Sekhar

maintainer Tested-by on the v2 series
#4 lore raw
In reply to Faiz Abbas
Quoted 9 lines · Faiz Abbas

The following patches add dt support for MMC/SD on TI's j7200-evm.

Currently, eMMC support upto HS200 speed and SD card supports upto high speed speed mode.

v2:
Fixed node names to use mmc@* format
Fixed reg address format to align with others in the file

Quoted 9 lines

Faiz Abbas (2):
arm64: dts: ti: k3-j7200-main: Add support for MMC/SD controller nodes
arm64: dts: ti: k3-j7200-common-proc-board: Add support for eMMC and
SD card

 .../dts/ti/k3-j7200-common-proc-board.dts     | 28 ++++++++++++++
 arch/arm64/boot/dts/ti/k3-j7200-main.dtsi     | 37 +++++++++++++++++++
 2 files changed, 65 insertions(+)

For the series:

[    1.678263] mmc0: Command Queue Engine enabled
[    1.682727] mmc0: new HS200 MMC card at address 0001
[    1.688193] mmcblk0: mmc0:0001 S0J56X 14.8 GiB
[    1.692971] mmcblk0boot0: mmc0:0001 S0J56X partition 1 31.5 MiB
[    1.699138] mmcblk0boot1: mmc0:0001 S0J56X partition 2 31.5 MiB
[    1.705268] mmcblk0rpmb: mmc0:0001 S0J56X partition 3 4.00 MiB, ch
ardev (240:0)
[    1.789527] mmc1: new high speed SDHC card at address aaaa
[    1.795621] mmcblk1: mmc1:aaaa SC16G 14.8 GiB
[    1.810074]  mmcblk1: p1 p2

SD hot plug works fine too..
Full log: https://pastebin.ubuntu.com/p/5hcCQDjhtW/

maintainer Applied
#5 lore raw
In reply to Faiz Abbas
Quoted 10 lines · Faiz Abbas

The following patches add dt support for MMC/SD on TI's j7200-evm.

Currently, eMMC support upto HS200 speed and SD card supports upto high speed speed mode.

v2:
Fixed node names to use mmc@* format
Fixed reg address format to align with others in the file

[...]

Hi Faiz Abbas,

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

[1/2] arm64: dts: ti: k3-j7200-main: Add support for MMC/SD controller nodes

      commit: 7cd03dc78b290400875b6b54e257ba5ea4e810c3
[2/2] arm64: dts: ti: k3-j7200-common-proc-board: Add support for eMMC and SD card
      commit: a2178b83ae8f61b2a9fae2aa9a4d4ed2511690a4

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] git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git

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