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

SDHCI nodes defined in the top-level J721s2 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/20230810003814.85450-4-afd@ti.com
Signed-off-by: Nishanth Menon <nm@ti.com>

diff --git a/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts b/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts
index e6e4133d1e9b91ed108297b3b112b2c845cba741..5fd06cd26b479ae16ae219e2a3cb02378a80c3ac 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts
@@ -475,13 +475,9 @@
        };
 };
 
-&main_sdhci0 {
-       /* Unused */
-       status = "disabled";
-};
-
 &main_sdhci1 {
        /* SD card */
+       status = "okay";
        pinctrl-0 = <&main_mmc1_pins_default>;
        pinctrl-names = "default";
        disable-wp;

diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
index e81ef8a7a8a26470a7ae3fdac87a6b41dea2346d..7794063b77c8a59dd9c83870b931fa2da6633daa 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
@@ -366,6 +366,7 @@
 
 &main_sdhci0 {
        /* eMMC */
+       status = "okay";
        non-removable;
        ti,driver-strength-ohm = <50>;
        disable-wp;
@@ -373,6 +374,7 @@
 
 &main_sdhci1 {
        /* SD card */
+       status = "okay";
        pinctrl-0 = <&main_mmc1_pins_default>;
        pinctrl-names = "default";
        disable-wp;

diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
index 20548d95ab138b9c22c8bbd5da5ba928931671ba..7470f7242520eb771e9962971d961e595e62efcc 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
@@ -737,6 +737,7 @@
                mmc-hs200-1_8v;
                mmc-hs400-1_8v;
                dma-coherent;
+               status = "disabled";
        };
 
        main_sdhci1: mmc@4fb0000 {
@@ -766,6 +767,7 @@
                dma-coherent;
                /* Masking support for SDR104 capability */
                sdhci-caps-mask = <0x00000003 0x00000000>;
+               status = "disabled";
        };
 
        main_navss: bus@30000000 {