Proxmox-Port/linux-loongson
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson synced 2025-09-07 14:19:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

arm64: dts: ti: k3-am6*: Fix bus-width property in MMC nodes

Browse Source 
Move bus-width property to *main.dtsi, above the OTAP/ITAP
delay values. While there is no error with where it is
currently at, it is easier to read the MMC node if the
bus-width property is located above the OTAP/ITAP delay
values consistently across MMC nodes.

Add missing bus-width for MMC2 in k3-am62-main.

Signed-off-by: Judith Mendez <jm@ti.com>
Tested-by: Wadim Egorov <w.egorov@phytec.de>
Link: https://lore.kernel.org/r/20240213235701.2438513-9-jm@ti.com
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
This commit is contained in:
Judith Mendez 2024-02-13 17:57:00 -06:00 committed by Vignesh Raghavendra
parent 2812d23ade
commit 0ae3113a46
6 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm64/boot/dts/ti/k3-am62-main.dtsi
View File

@ -558,9 +558,9 @@ sdhci0: mmc@fa10000 {
clock-names = "clk_ahb", "clk_xin"; clock-names = "clk_ahb", "clk_xin";
assigned-clocks = <&k3_clks 57 6>; assigned-clocks = <&k3_clks 57 6>;
assigned-clock-parents = <&k3_clks 57 8>; assigned-clock-parents = <&k3_clks 57 8>;
bus-width = <8>;
mmc-ddr-1_8v; mmc-ddr-1_8v;
mmc-hs200-1_8v; mmc-hs200-1_8v;
bus-width = <8>;
ti,clkbuf-sel = <0x7>; ti,clkbuf-sel = <0x7>;
ti,otap-del-sel-legacy = <0x0>; ti,otap-del-sel-legacy = <0x0>;
ti,otap-del-sel-mmc-hs = <0x0>; ti,otap-del-sel-mmc-hs = <0x0>;
@ -578,6 +578,7 @@ sdhci1: mmc@fa00000 {
power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>; power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 58 5>, <&k3_clks 58 6>; clocks = <&k3_clks 58 5>, <&k3_clks 58 6>;
clock-names = "clk_ahb", "clk_xin"; clock-names = "clk_ahb", "clk_xin";
bus-width = <4>;
ti,clkbuf-sel = <0x7>; ti,clkbuf-sel = <0x7>;
ti,otap-del-sel-legacy = <0x8>; ti,otap-del-sel-legacy = <0x8>;
ti,otap-del-sel-sd-hs = <0x0>; ti,otap-del-sel-sd-hs = <0x0>;
@ -590,7 +591,6 @@ sdhci1: mmc@fa00000 {
ti,itap-del-sel-sd-hs = <0x1>; ti,itap-del-sel-sd-hs = <0x1>;
ti,itap-del-sel-sdr12 = <0xa>; ti,itap-del-sel-sdr12 = <0xa>;
ti,itap-del-sel-sdr25 = <0x1>; ti,itap-del-sel-sdr25 = <0x1>;
bus-width = <4>;
status = "disabled"; status = "disabled";
}; };
@ -601,6 +601,7 @@ sdhci2: mmc@fa20000 {
power-domains = <&k3_pds 184 TI_SCI_PD_EXCLUSIVE>; power-domains = <&k3_pds 184 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 184 5>, <&k3_clks 184 6>; clocks = <&k3_clks 184 5>, <&k3_clks 184 6>;
clock-names = "clk_ahb", "clk_xin"; clock-names = "clk_ahb", "clk_xin";
bus-width = <4>;
ti,clkbuf-sel = <0x7>; ti,clkbuf-sel = <0x7>;
ti,otap-del-sel-legacy = <0x8>; ti,otap-del-sel-legacy = <0x8>;
ti,otap-del-sel-sd-hs = <0x0>; ti,otap-del-sel-sd-hs = <0x0>;

1
arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
View File

@ -842,7 +842,6 @@ &sdhci2 {
vmmc-supply = <&wlan_en>; vmmc-supply = <&wlan_en>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&wifi_pins_default>, <&wifi_32k_clk>; pinctrl-0 = <&wifi_pins_default>, <&wifi_32k_clk>;
bus-width = <4>;
non-removable; non-removable;
ti,fails-without-test-cd; ti,fails-without-test-cd;
cap-power-off-card; cap-power-off-card;

2
arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
View File

@ -560,6 +560,7 @@ sdhci1: mmc@fa00000 {
power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>; power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 58 5>, <&k3_clks 58 6>; clocks = <&k3_clks 58 5>, <&k3_clks 58 6>;
clock-names = "clk_ahb", "clk_xin"; clock-names = "clk_ahb", "clk_xin";
bus-width = <4>;
ti,clkbuf-sel = <0x7>; ti,clkbuf-sel = <0x7>;
ti,otap-del-sel-legacy = <0x0>; ti,otap-del-sel-legacy = <0x0>;
ti,otap-del-sel-sd-hs = <0x0>; ti,otap-del-sel-sd-hs = <0x0>;
@ -572,7 +573,6 @@ sdhci1: mmc@fa00000 {
ti,itap-del-sel-sd-hs = <0x0>; ti,itap-del-sel-sd-hs = <0x0>;
ti,itap-del-sel-sdr12 = <0x0>; ti,itap-del-sel-sdr12 = <0x0>;
ti,itap-del-sel-sdr25 = <0x0>; ti,itap-del-sel-sdr25 = <0x0>;
bus-width = <4>;
no-1-8-v; no-1-8-v;
status = "disabled"; status = "disabled";
}; };

2
arch/arm64/boot/dts/ti/k3-am64-main.dtsi
View File

@ -627,6 +627,7 @@ sdhci0: mmc@fa10000 {
power-domains = <&k3_pds 57 TI_SCI_PD_EXCLUSIVE>; power-domains = <&k3_pds 57 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 57 0>, <&k3_clks 57 1>; clocks = <&k3_clks 57 0>, <&k3_clks 57 1>;
clock-names = "clk_ahb", "clk_xin"; clock-names = "clk_ahb", "clk_xin";
bus-width = <8>;
mmc-ddr-1_8v; mmc-ddr-1_8v;
mmc-hs200-1_8v; mmc-hs200-1_8v;
ti,clkbuf-sel = <0x7>; ti,clkbuf-sel = <0x7>;
@ -648,6 +649,7 @@ sdhci1: mmc@fa00000 {
power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>; power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 58 3>, <&k3_clks 58 4>; clocks = <&k3_clks 58 3>, <&k3_clks 58 4>;
clock-names = "clk_ahb", "clk_xin"; clock-names = "clk_ahb", "clk_xin";
bus-width = <4>;
ti,clkbuf-sel = <0x7>; ti,clkbuf-sel = <0x7>;
ti,otap-del-sel-legacy = <0x0>; ti,otap-del-sel-legacy = <0x0>;
ti,otap-del-sel-sd-hs = <0x0>; ti,otap-del-sel-sd-hs = <0x0>;

2
arch/arm64/boot/dts/ti/k3-am642-evm.dts
View File

@ -494,7 +494,6 @@ eeprom@0 {
/* eMMC */ /* eMMC */
&sdhci0 { &sdhci0 {
status = "okay"; status = "okay";
bus-width = <8>;
non-removable; non-removable;
ti,driver-strength-ohm = <50>; ti,driver-strength-ohm = <50>;
disable-wp; disable-wp;
@ -506,7 +505,6 @@ &sdhci1 {
status = "okay"; status = "okay";
vmmc-supply = <&vdd_mmc1>; vmmc-supply = <&vdd_mmc1>;
pinctrl-names = "default"; pinctrl-names = "default";
bus-width = <4>;
pinctrl-0 = <&main_mmc1_pins_default>; pinctrl-0 = <&main_mmc1_pins_default>;
disable-wp; disable-wp;
}; };

1
arch/arm64/boot/dts/ti/k3-am642-sk.dts
View File

@ -469,7 +469,6 @@ &sdhci1 {
status = "okay"; status = "okay";
vmmc-supply = <&vdd_mmc1>; vmmc-supply = <&vdd_mmc1>;
pinctrl-names = "default"; pinctrl-names = "default";
bus-width = <4>;
pinctrl-0 = <&main_mmc1_pins_default>; pinctrl-0 = <&main_mmc1_pins_default>;
disable-wp; disable-wp;
}; };