Reorganize various MMC properties for MMC nodes to be
more uniform across devices.
Add ti,clkbuf-sel to MMC nodes that are missing this property.
Signed-off-by: Judith Mendez <[email protected]>
---
arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 5 +++--
arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 2 --
arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 4 ++--
arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 2 ++
arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 7 +++++--
arch/arm64/boot/dts/ti/k3-am642-evm.dts | 3 +--
arch/arm64/boot/dts/ti/k3-am642-sk.dts | 1 -
7 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
index ca825088970f..32a8a68f1311 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
@@ -559,9 +559,9 @@ sdhci0: mmc@fa10000 {
clock-names = "clk_ahb", "clk_xin";
assigned-clocks = <&k3_clks 57 6>;
assigned-clock-parents = <&k3_clks 57 8>;
+ bus-width = <8>;
mmc-ddr-1_8v;
mmc-hs200-1_8v;
- bus-width = <8>;
ti,clkbuf-sel = <0x7>;
ti,otap-del-sel-legacy = <0x0>;
ti,otap-del-sel-mmc-hs = <0x0>;
@@ -576,8 +576,8 @@ sdhci1: mmc@fa00000 {
power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 58 5>, <&k3_clks 58 6>;
clock-names = "clk_ahb", "clk_xin";
- ti,clkbuf-sel = <0x7>;
bus-width = <4>;
+ ti,clkbuf-sel = <0x7>;
ti,otap-del-sel-legacy = <0x0>;
ti,otap-del-sel-sd-hs = <0x0>;
ti,otap-del-sel-sdr12 = <0xf>;
@@ -599,6 +599,7 @@ sdhci2: mmc@fa20000 {
power-domains = <&k3_pds 184 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 184 5>, <&k3_clks 184 6>;
clock-names = "clk_ahb", "clk_xin";
+ bus-width = <4>;
ti,clkbuf-sel = <0x7>;
ti,otap-del-sel-legacy = <0x0>;
ti,otap-del-sel-sd-hs = <0x0>;
diff --git a/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts b/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
index f69dbf9b8406..0422615e4d98 100644
--- a/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
+++ b/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
@@ -836,7 +836,6 @@ &sdhci1 {
bootph-all;
pinctrl-names = "default";
pinctrl-0 = <&sd_pins_default>;
-
vmmc-supply = <&vdd_3v3_sd>;
vqmmc-supply = <&vdd_sd_dv>;
disable-wp;
@@ -850,7 +849,6 @@ &sdhci2 {
vmmc-supply = <&wlan_en>;
pinctrl-names = "default";
pinctrl-0 = <&wifi_pins_default>, <&wifi_32k_clk>;
- bus-width = <4>;
non-removable;
ti,fails-without-test-cd;
cap-power-off-card;
diff --git a/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
index db5a7746c82e..88b112e657c8 100644
--- a/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
@@ -561,6 +561,8 @@ sdhci1: mmc@fa00000 {
power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 58 5>, <&k3_clks 58 6>;
clock-names = "clk_ahb", "clk_xin";
+ bus-width = <4>;
+ ti,clkbuf-sel = <0x7>;
ti,otap-del-sel-legacy = <0x0>;
ti,otap-del-sel-sd-hs = <0x0>;
ti,otap-del-sel-sdr12 = <0xf>;
@@ -572,8 +574,6 @@ sdhci1: mmc@fa00000 {
ti,itap-del-sel-sd-hs = <0x0>;
ti,itap-del-sel-sdr12 = <0x0>;
ti,itap-del-sel-sdr25 = <0x0>;
- ti,clkbuf-sel = <0x7>;
- bus-width = <4>;
no-1-8-v;
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi b/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
index 6dd48c826f74..2b4c10b35db1 100644
--- a/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
@@ -407,10 +407,12 @@ &main_i2c2 {
};
&sdhci0 {
+ /* eMMC */
bootph-all;
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&main_mmc0_pins_default>;
+ non-removable;
disable-wp;
};
diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
index 1842f05ac351..34706ab9f5fb 100644
--- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
@@ -626,9 +626,11 @@ sdhci0: mmc@fa10000 {
power-domains = <&k3_pds 57 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 57 0>, <&k3_clks 57 1>;
clock-names = "clk_ahb", "clk_xin";
+ bus-width = <8>;
mmc-ddr-1_8v;
mmc-hs200-1_8v;
- ti,trm-icp = <0x2>;
+ 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-ddr52 = <0x6>;
@@ -646,6 +648,8 @@ sdhci1: mmc@fa00000 {
power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 58 3>, <&k3_clks 58 4>;
clock-names = "clk_ahb", "clk_xin";
+ bus-width = <4>;
+ ti,clkbuf-sel = <0x7>;
ti,otap-del-sel-legacy = <0x0>;
ti,otap-del-sel-sd-hs = <0x0>;
ti,otap-del-sel-sdr12 = <0xf>;
@@ -653,7 +657,6 @@ sdhci1: mmc@fa00000 {
ti,otap-del-sel-sdr50 = <0xc>;
ti,otap-del-sel-sdr104 = <0x6>;
ti,otap-del-sel-ddr50 = <0x9>;
- ti,clkbuf-sel = <0x7>;
ti,itap-del-sel-legacy = <0x0>;
ti,itap-del-sel-sd-hs = <0x0>;
ti,itap-del-sel-sdr12 = <0x0>;
diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm.dts b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
index 0583ec3a9b52..572b98a217a6 100644
--- a/arch/arm64/boot/dts/ti/k3-am642-evm.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
@@ -493,8 +493,8 @@ eeprom@0 {
/* eMMC */
&sdhci0 {
+ bootph-all;
status = "okay";
- bus-width = <8>;
non-removable;
ti,driver-strength-ohm = <50>;
disable-wp;
@@ -506,7 +506,6 @@ &sdhci1 {
status = "okay";
vmmc-supply = <&vdd_mmc1>;
pinctrl-names = "default";
- bus-width = <4>;
pinctrl-0 = <&main_mmc1_pins_default>;
disable-wp;
};
diff --git a/arch/arm64/boot/dts/ti/k3-am642-sk.dts b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
index c3a77f6282cb..600056105874 100644
--- a/arch/arm64/boot/dts/ti/k3-am642-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
@@ -469,7 +469,6 @@ &sdhci1 {
status = "okay";
vmmc-supply = <&vdd_mmc1>;
pinctrl-names = "default";
- bus-width = <4>;
pinctrl-0 = <&main_mmc1_pins_default>;
disable-wp;
};
--
2.34.1
On 31/01/2024 02:37, Judith Mendez wrote:
> Reorganize various MMC properties for MMC nodes to be
> more uniform across devices.
>
> Add ti,clkbuf-sel to MMC nodes that are missing this property.
>
> Signed-off-by: Judith Mendez <[email protected]>
> ---
> arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 5 +++--
> arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 2 --
> arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 4 ++--
> arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 2 ++
> arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 7 +++++--
> arch/arm64/boot/dts/ti/k3-am642-evm.dts | 3 +--
> arch/arm64/boot/dts/ti/k3-am642-sk.dts | 1 -
> 7 files changed, 13 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
> index ca825088970f..32a8a68f1311 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
> @@ -559,9 +559,9 @@ sdhci0: mmc@fa10000 {
> clock-names = "clk_ahb", "clk_xin";
> assigned-clocks = <&k3_clks 57 6>;
> assigned-clock-parents = <&k3_clks 57 8>;
> + bus-width = <8>;
Is bus-width fix for this instance? If not then we don't really know here what
bus-width is used by the board implementation. And it should come in the
board DTS file.
> mmc-ddr-1_8v;
> mmc-hs200-1_8v;
> - bus-width = <8>;
> ti,clkbuf-sel = <0x7>;
> ti,otap-del-sel-legacy = <0x0>;
> ti,otap-del-sel-mmc-hs = <0x0>;
> @@ -576,8 +576,8 @@ sdhci1: mmc@fa00000 {
> power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 58 5>, <&k3_clks 58 6>;
> clock-names = "clk_ahb", "clk_xin";
> - ti,clkbuf-sel = <0x7>;
> bus-width = <4>;
> + ti,clkbuf-sel = <0x7>;
> ti,otap-del-sel-legacy = <0x0>;
> ti,otap-del-sel-sd-hs = <0x0>;
> ti,otap-del-sel-sdr12 = <0xf>;
> @@ -599,6 +599,7 @@ sdhci2: mmc@fa20000 {
> power-domains = <&k3_pds 184 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 184 5>, <&k3_clks 184 6>;
> clock-names = "clk_ahb", "clk_xin";
> + bus-width = <4>;
> ti,clkbuf-sel = <0x7>;
> ti,otap-del-sel-legacy = <0x0>;
> ti,otap-del-sel-sd-hs = <0x0>;
> diff --git a/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts b/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
> index f69dbf9b8406..0422615e4d98 100644
> --- a/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
> +++ b/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
> @@ -836,7 +836,6 @@ &sdhci1 {
> bootph-all;
> pinctrl-names = "default";
> pinctrl-0 = <&sd_pins_default>;
> -
> vmmc-supply = <&vdd_3v3_sd>;
> vqmmc-supply = <&vdd_sd_dv>;
> disable-wp;
> @@ -850,7 +849,6 @@ &sdhci2 {
> vmmc-supply = <&wlan_en>;
> pinctrl-names = "default";
> pinctrl-0 = <&wifi_pins_default>, <&wifi_32k_clk>;
> - bus-width = <4>;
I wouldn't remove this from here if bus-width is variable for this
instance of MMC controller.
> non-removable;
> ti,fails-without-test-cd;
> cap-power-off-card;
> diff --git a/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
> index db5a7746c82e..88b112e657c8 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
> @@ -561,6 +561,8 @@ sdhci1: mmc@fa00000 {
> power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 58 5>, <&k3_clks 58 6>;
> clock-names = "clk_ahb", "clk_xin";
> + bus-width = <4>;
> + ti,clkbuf-sel = <0x7>;
> ti,otap-del-sel-legacy = <0x0>;
> ti,otap-del-sel-sd-hs = <0x0>;
> ti,otap-del-sel-sdr12 = <0xf>;
> @@ -572,8 +574,6 @@ sdhci1: mmc@fa00000 {
> ti,itap-del-sel-sd-hs = <0x0>;
> ti,itap-del-sel-sdr12 = <0x0>;
> ti,itap-del-sel-sdr25 = <0x0>;
> - ti,clkbuf-sel = <0x7>;
> - bus-width = <4>;
> no-1-8-v;
> status = "disabled";
> };
> diff --git a/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi b/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
> index 6dd48c826f74..2b4c10b35db1 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
> @@ -407,10 +407,12 @@ &main_i2c2 {
> };
>
> &sdhci0 {
> + /* eMMC */
> bootph-all;
> status = "okay";
> pinctrl-names = "default";
> pinctrl-0 = <&main_mmc0_pins_default>;
> + non-removable;
> disable-wp;
> };
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
> index 1842f05ac351..34706ab9f5fb 100644
> --- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
> @@ -626,9 +626,11 @@ sdhci0: mmc@fa10000 {
> power-domains = <&k3_pds 57 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 57 0>, <&k3_clks 57 1>;
> clock-names = "clk_ahb", "clk_xin";
> + bus-width = <8>;
> mmc-ddr-1_8v;
> mmc-hs200-1_8v;
> - ti,trm-icp = <0x2>;
> + 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-ddr52 = <0x6>;
> @@ -646,6 +648,8 @@ sdhci1: mmc@fa00000 {
> power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 58 3>, <&k3_clks 58 4>;
> clock-names = "clk_ahb", "clk_xin";
> + bus-width = <4>;
> + ti,clkbuf-sel = <0x7>;
> ti,otap-del-sel-legacy = <0x0>;
> ti,otap-del-sel-sd-hs = <0x0>;
> ti,otap-del-sel-sdr12 = <0xf>;
> @@ -653,7 +657,6 @@ sdhci1: mmc@fa00000 {
> ti,otap-del-sel-sdr50 = <0xc>;
> ti,otap-del-sel-sdr104 = <0x6>;
> ti,otap-del-sel-ddr50 = <0x9>;
> - ti,clkbuf-sel = <0x7>;
> ti,itap-del-sel-legacy = <0x0>;
> ti,itap-del-sel-sd-hs = <0x0>;
> ti,itap-del-sel-sdr12 = <0x0>;
> diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm.dts b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
> index 0583ec3a9b52..572b98a217a6 100644
> --- a/arch/arm64/boot/dts/ti/k3-am642-evm.dts
> +++ b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
> @@ -493,8 +493,8 @@ eeprom@0 {
>
> /* eMMC */
> &sdhci0 {
> + bootph-all;
> status = "okay";
> - bus-width = <8>;
> non-removable;
> ti,driver-strength-ohm = <50>;
> disable-wp;
> @@ -506,7 +506,6 @@ &sdhci1 {
> status = "okay";
> vmmc-supply = <&vdd_mmc1>;
> pinctrl-names = "default";
> - bus-width = <4>;
> pinctrl-0 = <&main_mmc1_pins_default>;
> disable-wp;
> };
> diff --git a/arch/arm64/boot/dts/ti/k3-am642-sk.dts b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
> index c3a77f6282cb..600056105874 100644
> --- a/arch/arm64/boot/dts/ti/k3-am642-sk.dts
> +++ b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
> @@ -469,7 +469,6 @@ &sdhci1 {
> status = "okay";
> vmmc-supply = <&vdd_mmc1>;
> pinctrl-names = "default";
> - bus-width = <4>;
> pinctrl-0 = <&main_mmc1_pins_default>;
> disable-wp;
> };
--
cheers,
-roger
Hi Roger,
On 2/2/24 3:54 AM, Roger Quadros wrote:
>
>
> On 31/01/2024 02:37, Judith Mendez wrote:
>> Reorganize various MMC properties for MMC nodes to be
>> more uniform across devices.
>>
>> Add ti,clkbuf-sel to MMC nodes that are missing this property.
>>
>> Signed-off-by: Judith Mendez <[email protected]>
>> ---
>> arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 5 +++--
>> arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 2 --
>> arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 4 ++--
>> arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 2 ++
>> arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 7 +++++--
>> arch/arm64/boot/dts/ti/k3-am642-evm.dts | 3 +--
>> arch/arm64/boot/dts/ti/k3-am642-sk.dts | 1 -
>> 7 files changed, 13 insertions(+), 11 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
>> index ca825088970f..32a8a68f1311 100644
>> --- a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
>> +++ b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
>> @@ -559,9 +559,9 @@ sdhci0: mmc@fa10000 {
>> clock-names = "clk_ahb", "clk_xin";
>> assigned-clocks = <&k3_clks 57 6>;
>> assigned-clock-parents = <&k3_clks 57 8>;
>> + bus-width = <8>;
>
> Is bus-width fix for this instance? If not then we don't really know here what
> bus-width is used by the board implementation. And it should come in the
> board DTS file.
I move bus-width changes to a different patch in v1. Why should it come
in the board DTS file?
>
>> mmc-ddr-1_8v;
>> mmc-hs200-1_8v;
>> - bus-width = <8>;
>> ti,clkbuf-sel = <0x7>;
>> ti,otap-del-sel-legacy = <0x0>;
>> ti,otap-del-sel-mmc-hs = <0x0>;
>> @@ -576,8 +576,8 @@ sdhci1: mmc@fa00000 {
>> power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>;
>> clocks = <&k3_clks 58 5>, <&k3_clks 58 6>;
>> clock-names = "clk_ahb", "clk_xin";
>> - ti,clkbuf-sel = <0x7>;
>> bus-width = <4>;
>> + ti,clkbuf-sel = <0x7>;
>> ti,otap-del-sel-legacy = <0x0>;
>> ti,otap-del-sel-sd-hs = <0x0>;
>> ti,otap-del-sel-sdr12 = <0xf>;
>> @@ -599,6 +599,7 @@ sdhci2: mmc@fa20000 {
>> power-domains = <&k3_pds 184 TI_SCI_PD_EXCLUSIVE>;
>> clocks = <&k3_clks 184 5>, <&k3_clks 184 6>;
>> clock-names = "clk_ahb", "clk_xin";
>> + bus-width = <4>;
>> ti,clkbuf-sel = <0x7>;
>> ti,otap-del-sel-legacy = <0x0>;
>> ti,otap-del-sel-sd-hs = <0x0>;
>> diff --git a/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts b/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
>> index f69dbf9b8406..0422615e4d98 100644
>> --- a/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
>> +++ b/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
>> @@ -836,7 +836,6 @@ &sdhci1 {
>> bootph-all;
>> pinctrl-names = "default";
>> pinctrl-0 = <&sd_pins_default>;
>> -
>> vmmc-supply = <&vdd_3v3_sd>;
>> vqmmc-supply = <&vdd_sd_dv>;
>> disable-wp;
>> @@ -850,7 +849,6 @@ &sdhci2 {
>> vmmc-supply = <&wlan_en>;
>> pinctrl-names = "default";
>> pinctrl-0 = <&wifi_pins_default>, <&wifi_32k_clk>;
>> - bus-width = <4>;
>
> I wouldn't remove this from here if bus-width is variable for this
> instance of MMC controller.
It is moved to the .dtsi file. Sorry for the confusion.
>
>> non-removable;
>> ti,fails-without-test-cd;
>> cap-power-off-card;
>> diff --git a/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
>> index db5a7746c82e..88b112e657c8 100644
>> --- a/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
>> +++ b/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
>> @@ -561,6 +561,8 @@ sdhci1: mmc@fa00000 {
>> power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>;
>> clocks = <&k3_clks 58 5>, <&k3_clks 58 6>;
>> clock-names = "clk_ahb", "clk_xin";
>> + bus-width = <4>;
>> + ti,clkbuf-sel = <0x7>;
>> ti,otap-del-sel-legacy = <0x0>;
>> ti,otap-del-sel-sd-hs = <0x0>;
>> ti,otap-del-sel-sdr12 = <0xf>;
>> @@ -572,8 +574,6 @@ sdhci1: mmc@fa00000 {
>> ti,itap-del-sel-sd-hs = <0x0>;
>> ti,itap-del-sel-sdr12 = <0x0>;
>> ti,itap-del-sel-sdr25 = <0x0>;
>> - ti,clkbuf-sel = <0x7>;
>> - bus-width = <4>;
>> no-1-8-v;
>> status = "disabled";
>> };
>> diff --git a/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi b/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
>> index 6dd48c826f74..2b4c10b35db1 100644
>> --- a/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
>> +++ b/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
>> @@ -407,10 +407,12 @@ &main_i2c2 {
>> };
>>
>> &sdhci0 {
>> + /* eMMC */
>> bootph-all;
>> status = "okay";
>> pinctrl-names = "default";
>> pinctrl-0 = <&main_mmc0_pins_default>;
>> + non-removable;
>> disable-wp;
>> };
>>
>> diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
>> index 1842f05ac351..34706ab9f5fb 100644
>> --- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
>> +++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
>> @@ -626,9 +626,11 @@ sdhci0: mmc@fa10000 {
>> power-domains = <&k3_pds 57 TI_SCI_PD_EXCLUSIVE>;
>> clocks = <&k3_clks 57 0>, <&k3_clks 57 1>;
>> clock-names = "clk_ahb", "clk_xin";
>> + bus-width = <8>;
>> mmc-ddr-1_8v;
>> mmc-hs200-1_8v;
>> - ti,trm-icp = <0x2>;
>> + 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-ddr52 = <0x6>;
>> @@ -646,6 +648,8 @@ sdhci1: mmc@fa00000 {
>> power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>;
>> clocks = <&k3_clks 58 3>, <&k3_clks 58 4>;
>> clock-names = "clk_ahb", "clk_xin";
>> + bus-width = <4>;
>> + ti,clkbuf-sel = <0x7>;
>> ti,otap-del-sel-legacy = <0x0>;
>> ti,otap-del-sel-sd-hs = <0x0>;
>> ti,otap-del-sel-sdr12 = <0xf>;
>> @@ -653,7 +657,6 @@ sdhci1: mmc@fa00000 {
>> ti,otap-del-sel-sdr50 = <0xc>;
>> ti,otap-del-sel-sdr104 = <0x6>;
>> ti,otap-del-sel-ddr50 = <0x9>;
>> - ti,clkbuf-sel = <0x7>;
>> ti,itap-del-sel-legacy = <0x0>;
>> ti,itap-del-sel-sd-hs = <0x0>;
>> ti,itap-del-sel-sdr12 = <0x0>;
>> diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm.dts b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
>> index 0583ec3a9b52..572b98a217a6 100644
>> --- a/arch/arm64/boot/dts/ti/k3-am642-evm.dts
>> +++ b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
>> @@ -493,8 +493,8 @@ eeprom@0 {
>>
>> /* eMMC */
>> &sdhci0 {
>> + bootph-all;
>> status = "okay";
>> - bus-width = <8>;
>> non-removable;
>> ti,driver-strength-ohm = <50>;
>> disable-wp;
>> @@ -506,7 +506,6 @@ &sdhci1 {
>> status = "okay";
>> vmmc-supply = <&vdd_mmc1>;
>> pinctrl-names = "default";
>> - bus-width = <4>;
>> pinctrl-0 = <&main_mmc1_pins_default>;
>> disable-wp;
>> };
>> diff --git a/arch/arm64/boot/dts/ti/k3-am642-sk.dts b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
>> index c3a77f6282cb..600056105874 100644
>> --- a/arch/arm64/boot/dts/ti/k3-am642-sk.dts
>> +++ b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
>> @@ -469,7 +469,6 @@ &sdhci1 {
>> status = "okay";
>> vmmc-supply = <&vdd_mmc1>;
>> pinctrl-names = "default";
>> - bus-width = <4>;
>> pinctrl-0 = <&main_mmc1_pins_default>;
>> disable-wp;
>> };
>
~ Judith