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

[ 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>

diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
index 0df54a74182474841d2ba0870d8d637fefcd525f..693e7550bf9559085979574c3b74d2f6fd2f242d 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
@@ -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 {

diff --git a/arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi b/arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi
index 1c2c8f0daca9ffbc9a0d2fb11910465f93a4b04f..1dcbf1fe7fae47a13abee580173e59af3bd62e33 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi
@@ -200,6 +200,7 @@
 };
 
 &sdhci0 {
+       status = "okay";
        bus-width = <8>;
        non-removable;
        ti,driver-strength-ohm = <50>;

diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm.dts b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
index d0e1191baecd6386dc7b2ddb1c0371c203bcb9ad..91d726ef7594a37c8f016c2c928168e57e7f7d56 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am642-evm.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
@@ -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>;

diff --git a/arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dts b/arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dts
index 9175e96842d821f5b54eb383aecb840692ffff8d..53b64e55413f99e45ca93ec98e39cd224e3599ee 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dts
@@ -264,6 +264,7 @@
 };
 
 &sdhci1 {
+       status = "okay";
        vmmc-supply = <&vcc_3v3_mmc>;
        pinctrl-names = "default";
        pinctrl-0 = <&main_mmc1_pins_default>;

diff --git a/arch/arm64/boot/dts/ti/k3-am642-sk.dts b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
index f29c8a9b59ba7d94304d56efd1c806dfd7d1dcb1..bffbd234f715ad98ce3984738ace5809489e27be 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am642-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
@@ -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>;

diff --git a/arch/arm64/boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts b/arch/arm64/boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts
index 04c15b64f0b776c41945aa05f50a135df21aecef..76ff44e71ec177f58e97ab4a552568a77e102056 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts
@@ -420,7 +420,6 @@
        ti,driver-strength-ohm = <50>;
        ti,fails-without-test-cd;
        /* Enabled by overlay */
-       status = "disabled";
 };
 
 &tscadc0 {

diff --git a/arch/arm64/boot/dts/ti/k3-am642-tqma64xxl.dtsi b/arch/arm64/boot/dts/ti/k3-am642-tqma64xxl.dtsi
index 6229849b5d9682fd3bfad5b728ae08f285ea149b..65dbbff64ed961a175ac2129c672cfadf3455d0e 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am642-tqma64xxl.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am642-tqma64xxl.dtsi
@@ -207,6 +207,7 @@
 };
 
 &sdhci0 {
+       status = "okay";
        non-removable;
        disable-wp;
        no-sdio;