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

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

As the pinmux is only known 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>
Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Bryan Brattlof <bb@ti.com>
Link: https://lore.kernel.org/r/20221018211533.21335-10-afd@ti.com

diff --git a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
index 43eebff..5a2cd47 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
@@ -407,6 +407,7 @@
                ti,otap-del-sel-mmc-hs = <0x0>;
                ti,otap-del-sel-ddr52 = <0x9>;
                ti,otap-del-sel-hs200 = <0x6>;
+               status = "disabled";
        };
 
        sdhci1: mmc@fa00000 {
@@ -430,6 +431,7 @@
                ti,itap-del-sel-sdr25 = <0x0>;
                ti,clkbuf-sel = <0x7>;
                bus-width = <4>;
+               status = "disabled";
        };
 
        sdhci2: mmc@fa20000 {
@@ -452,6 +454,7 @@
                ti,itap-del-sel-sdr12 = <0x0>;
                ti,itap-del-sel-sdr25 = <0x0>;
                ti,clkbuf-sel = <0x7>;
+               status = "disabled";
        };
 
        fss: bus@fc00000 {

diff --git a/arch/arm64/boot/dts/ti/k3-am625-sk.dts b/arch/arm64/boot/dts/ti/k3-am625-sk.dts
index b6d5336..3c98b63 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am625-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am625-sk.dts
@@ -335,6 +335,7 @@
 };
 
 &sdhci0 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&main_mmc0_pins_default>;
        ti,driver-strength-ohm = <50>;
@@ -343,6 +344,7 @@
 
 &sdhci1 {
        /* SD/MMC */
+       status = "okay";
        vmmc-supply = <&vdd_mmc1>;
        vqmmc-supply = <&vdd_sd_dv>;
        pinctrl-names = "default";