iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm64: dts: ti: k3-am64: Enable SDHCI nodes at the board level

Browse Source 
[ Upstream commit 3b6345e3fcf4c93a79f396121cd0e6f98f04da13 ]

SDHCI nodes defined in the top-level AM64 SoC dtsi files are incomplete
and will not be functional unless they are extended.

As the attached SD/eMMC is only known about at the board integration level,
these nodes should only be enabled when provided with this information.

Disable the SDHCI nodes in the dtsi files and only enable the ones that
are actually pinned out on a given board.

Signed-off-by: Andrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20231117163339.89952-2-afd@ti.com
Signed-off-by: Nishanth Menon <nm@ti.com>
Stable-dep-of: 379c7752bbd0 ("arm64: dts: ti: k3-am64-main: Fix ITAP/OTAP values for MMC")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Andrew Davis 2023-11-17 10:33:39 -06:00 committed by Sasha Levin
parent b024e67323
commit b0e4672f4e
7 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -612,6 +612,7 @@
ti,otap-del-sel-mmc-hs = <0x0>;
ti,otap-del-sel-ddr52 = <0x6>;
ti,otap-del-sel-hs200 = <0x7>;
status = "disabled";
};
sdhci1: mmc@fa00000 {
@ -630,6 +631,7 @@
ti,otap-del-sel-sdr104 = <0x6>;
ti,otap-del-sel-ddr50 = <0x9>;
ti,clkbuf-sel = <0x7>;
status = "disabled";
};
cpsw3g: ethernet@8000000 {

1
arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi
View File

@ -200,6 +200,7 @@
};
&sdhci0 {
status = "okay";
bus-width = <8>;
non-removable;
ti,driver-strength-ohm = <50>;

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

@ -478,17 +478,19 @@
};
};
/* eMMC */
&sdhci0 {
/* emmc */
status = "okay";
bus-width = <8>;
non-removable;
ti,driver-strength-ohm = <50>;
disable-wp;
};
/* SD/MMC */
&sdhci1 {
/* SD/MMC */
bootph-all;
status = "okay";
vmmc-supply = <&vdd_mmc1>;
pinctrl-names = "default";
bus-width = <4>;

1
arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dts
View File

@ -264,6 +264,7 @@
};
&sdhci1 {
status = "okay";
vmmc-supply = <&vcc_3v3_mmc>;
pinctrl-names = "default";
pinctrl-0 = <&main_mmc1_pins_default>;

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

@ -439,6 +439,7 @@
};
&sdhci0 {
status = "okay";
vmmc-supply = <&wlan_en>;
bus-width = <4>;
non-removable;
@ -458,9 +459,10 @@
};
};
/* SD/MMC */
&sdhci1 {
/* SD/MMC */
bootph-all;
status = "okay";
vmmc-supply = <&vdd_mmc1>;
pinctrl-names = "default";
bus-width = <4>;

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

@ -420,7 +420,6 @@
ti,driver-strength-ohm = <50>;
ti,fails-without-test-cd;
/* Enabled by overlay */
status = "disabled";
};
&tscadc0 {

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

@ -207,6 +207,7 @@
};
&sdhci0 {
status = "okay";
non-removable;
disable-wp;
no-sdio;