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

SDHCI nodes defined in the top-level J721e 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>
Reviewed-by: Dhruva Gole <d-gole@ti.com>
Link: https://lore.kernel.org/r/20230810003814.85450-2-afd@ti.com
Signed-off-by: Nishanth Menon <nm@ti.com>

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts b/arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts
index 66aac14..64eed76 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts
@@ -563,6 +563,7 @@
 
 &main_sdhci0 {
        /* eMMC */
+       status = "okay";
        non-removable;
        ti,driver-strength-ohm = <50>;
        disable-wp;
@@ -570,6 +571,7 @@
 
 &main_sdhci1 {
        /* SD Card */
+       status = "okay";
        vmmc-supply = <&vdd_mmc1>;
        vqmmc-supply = <&vdd_sd_dv_alt>;
        pinctrl-names = "default";
@@ -578,11 +580,6 @@
        disable-wp;
 };
 
-&main_sdhci2 {
-       /* Unused */
-       status = "disabled";
-};
-
 &ospi0 {
        /* Unused */
        status = "disabled";

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
index c1cbbae..e9b84d2 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
@@ -504,6 +504,7 @@
 
 &main_sdhci0 {
        /* eMMC */
+       status = "okay";
        non-removable;
        ti,driver-strength-ohm = <50>;
        disable-wp;
@@ -511,6 +512,7 @@
 
 &main_sdhci1 {
        /* SD/MMC */
+       status = "okay";
        vmmc-supply = <&vdd_mmc1>;
        vqmmc-supply = <&vdd_sd_dv_alt>;
        pinctrl-names = "default";
@@ -519,11 +521,6 @@
        disable-wp;
 };
 
-&main_sdhci2 {
-       /* Unused */
-       status = "disabled";
-};
-
 &usb_serdes_mux {
        idle-states = <1>, <0>; /* USB0 to SERDES3, USB1 to SERDES1 */
 };

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
index 68a8abf..3c53ddd 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
@@ -1479,6 +1479,7 @@
                ti,itap-del-sel-ddr52 = <0x3>;
                ti,trm-icp = <0x8>;
                dma-coherent;
+               status = "disabled";
        };
 
        main_sdhci1: mmc@4fb0000 {
@@ -1506,6 +1507,7 @@
                ti,clkbuf-sel = <0x7>;
                dma-coherent;
                sdhci-caps-mask = <0x2 0x0>;
+               status = "disabled";
        };
 
        main_sdhci2: mmc@4f98000 {
@@ -1533,6 +1535,7 @@
                ti,clkbuf-sel = <0x7>;
                dma-coherent;
                sdhci-caps-mask = <0x2 0x0>;
+               status = "disabled";
        };
 
        usbss0: cdns-usb@4104000 {

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-sk.dts b/arch/arm64/boot/dts/ti/k3-j721e-sk.dts
index 0ee4f38..bd1bd1b 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721e-sk.dts
@@ -582,13 +582,9 @@
        pinctrl-0 = <&main_uart1_pins_default>;
 };
 
-&main_sdhci0 {
-       /* Unused */
-       status = "disabled";
-};
-
 &main_sdhci1 {
        /* SD Card */
+       status = "okay";
        vmmc-supply = <&vdd_mmc1>;
        vqmmc-supply = <&vdd_sd_dv_alt>;
        pinctrl-names = "default";
@@ -597,11 +593,6 @@
        disable-wp;
 };
 
-&main_sdhci2 {
-       /* Unused */
-       status = "disabled";
-};
-
 &ospi0 {
        pinctrl-names = "default";
        pinctrl-0 = <&mcu_fss0_ospi0_pins_default>;