Commit 94374990 authored by Aswath Govindraju's avatar Aswath Govindraju Committed by Nishanth Menon
Browse files

arm64: dts: ti: k3-j7200: Add support for higher speed modes and update delay... 

arm64: dts: ti: k3-j7200: Add support for higher speed modes and update delay select values for MMCSD subsystems

The following speed modes are now supported in J7200 SoC,
- HS200 and HS400 modes at 1.8 V card voltage, in MMCSD0 subsystem [1].
- UHS-I speed modes in MMCSD1 subsystem [1].

Add support for UHS-I modes by adding voltage regulator device tree nodes
and corresponding pinmux details, to power cycle and voltage switch cards.
Set respective tags in sdhci0 and remove no-1-8-v tag from sdhci1
device tree nodes.

Also update the delay values for various speed modes supported, based on
the revised january 2021 J7200 datasheet[2].

[1] - section 12.3.6.1.1 MMCSD Features, in
      https://www.ti.com/lit/ug/spruiu1a/spruiu1a.pdf,
      (SPRUIU1A – JULY 2020 – REVISED JANUARY 2021)

[2] - https://www.ti.com/lit/ds/symlink/dra821u.pdf

,
      (SPRSP57B – APRIL 2020 – REVISED JANUARY 2021)

Signed-off-by: default avatarAswath Govindraju <a-govindraju@ti.com>
Signed-off-by: default avatarNishanth Menon <nm@ti.com>
Reviewed-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Link: https://lore.kernel.org/r/20210326064120.31919-4-a-govindraju@ti.com
parent f4cc7daf

arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts

+78 −0
Original line number Diff line number Diff line
@@ -16,6 +16,65 @@ chosen { 
		stdout-path = "serial2:115200n8";

		bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x02800000";

	};



	evm_12v0: fixedregulator-evm12v0 {

		/* main supply */

		compatible = "regulator-fixed";

		regulator-name = "evm_12v0";

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;

		regulator-always-on;

		regulator-boot-on;

	};



	vsys_3v3: fixedregulator-vsys3v3 {

		/* Output of LM5140 */

		compatible = "regulator-fixed";

		regulator-name = "vsys_3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&evm_12v0>;

		regulator-always-on;

		regulator-boot-on;

	};



	vsys_5v0: fixedregulator-vsys5v0 {

		/* Output of LM5140 */

		compatible = "regulator-fixed";

		regulator-name = "vsys_5v0";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		vin-supply = <&evm_12v0>;

		regulator-always-on;

		regulator-boot-on;

	};



	vdd_mmc1: fixedregulator-sd {

		/* Output of TPS22918 */

		compatible = "regulator-fixed";

		regulator-name = "vdd_mmc1";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-boot-on;

		enable-active-high;

		vin-supply = <&vsys_3v3>;

		gpio = <&exp2 2 GPIO_ACTIVE_HIGH>;

	};



	vdd_sd_dv: gpio-regulator-TLV71033 {

		/* Output of TLV71033 */

		compatible = "regulator-gpio";

		regulator-name = "tlv71033";

		pinctrl-names = "default";

		pinctrl-0 = <&vdd_sd_dv_pins_default>;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3300000>;

		regulator-boot-on;

		vin-supply = <&vsys_5v0>;

		gpios = <&main_gpio0 55 GPIO_ACTIVE_HIGH>;

		states = <1800000 0x0>,

			 <3300000 0x1>;

	};

};



&wkup_pmx0 {
@@ -45,6 +104,13 @@ J721E_WKUP_IOPAD(0x0098, PIN_INPUT, 0) /* (L4) MCU_MDIO0_MDIO */ 
};



&main_pmx0 {

	main_i2c0_pins_default: main-i2c0-pins-default {

		pinctrl-single,pins = <

			J721E_IOPAD(0xd4, PIN_INPUT_PULLUP, 0) /* (V3) I2C0_SCL */

			J721E_IOPAD(0xd8, PIN_INPUT_PULLUP, 0) /* (W2) I2C0_SDA */

		>;

	};



	main_i2c1_pins_default: main-i2c1-pins-default {

		pinctrl-single,pins = <

			J721E_IOPAD(0xdc, PIN_INPUT_PULLUP, 3) /* (U3) ECAP0_IN_APWM_OUT.I2C1_SCL */
@@ -70,6 +136,12 @@ main_usbss0_pins_default: main-usbss0-pins-default { 
			J721E_IOPAD(0x120, PIN_OUTPUT, 0) /* (T4) USB0_DRVVBUS */

		>;

	};



	vdd_sd_dv_pins_default: vdd-sd-dv-pins-default {

		pinctrl-single,pins = <

			J721E_IOPAD(0xd0, PIN_OUTPUT, 7) /* (T5) SPI0_D1.GPIO0_55 */

		>;

	};

};



&wkup_uart0 {
@@ -157,6 +229,10 @@ &cpsw_port1 { 
};



&main_i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&main_i2c0_pins_default>;

	clock-frequency = <400000>;



	exp1: gpio@20 {

		compatible = "ti,tca6416";

		reg = <0x20>;
@@ -206,6 +282,8 @@ &main_sdhci1 { 
	/* SD card */

	pinctrl-0 = <&main_mmc1_pins_default>;

	pinctrl-names = "default";

	vmmc-supply = <&vdd_mmc1>;

	vqmmc-supply = <&vdd_sd_dv>;

	ti,driver-strength-ohm = <50>;

	disable-wp;

};

arch/arm64/boot/dts/ti/k3-j7200-main.dtsi

+12 −2
Original line number Diff line number Diff line
@@ -512,11 +512,16 @@ main_sdhci0: mmc@4f80000 { 
		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,otap-del-sel-hs400 = <0x5>;

		ti,itap-del-sel-legacy = <0x10>;

		ti,itap-del-sel-mmc-hs = <0xa>;

		ti,strobe-sel = <0x77>;

		ti,clkbuf-sel = <0x7>;

		ti,trm-icp = <0x8>;

		bus-width = <8>;

		mmc-ddr-1_8v;

		mmc-hs200-1_8v;

		mmc-hs400-1_8v;

		dma-coherent;

	};
@@ -534,7 +539,12 @@ main_sdhci1: mmc@4fb0000 { 
		ti,otap-del-sel-sdr50 = <0xc>;

		ti,otap-del-sel-sdr104 = <0x5>;

		ti,otap-del-sel-ddr50 = <0xc>;

		no-1-8-v;

		ti,itap-del-sel-legacy = <0x0>;

		ti,itap-del-sel-sd-hs = <0x0>;

		ti,itap-del-sel-sdr12 = <0x0>;

		ti,itap-del-sel-sdr25 = <0x0>;

		ti,clkbuf-sel = <0x7>;

		ti,trm-icp = <0x8>;

		dma-coherent;

	};