Commit 5f715be3 authored by Andrew Davis's avatar Andrew Davis Committed by Nishanth Menon

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: default avatarAndrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20230810003814.85450-4-afd@ti.comSigned-off-by: default avatarNishanth Menon <nm@ti.com>
parent 013b7dd3
...@@ -475,13 +475,9 @@ exp2: gpio@20 { ...@@ -475,13 +475,9 @@ exp2: gpio@20 {
}; };
}; };
&main_sdhci0 {
/* Unused */
status = "disabled";
};
&main_sdhci1 { &main_sdhci1 {
/* SD card */ /* SD card */
status = "okay";
pinctrl-0 = <&main_mmc1_pins_default>; pinctrl-0 = <&main_mmc1_pins_default>;
pinctrl-names = "default"; pinctrl-names = "default";
disable-wp; disable-wp;
......
...@@ -366,6 +366,7 @@ exp2: gpio@22 { ...@@ -366,6 +366,7 @@ exp2: gpio@22 {
&main_sdhci0 { &main_sdhci0 {
/* eMMC */ /* eMMC */
status = "okay";
non-removable; non-removable;
ti,driver-strength-ohm = <50>; ti,driver-strength-ohm = <50>;
disable-wp; disable-wp;
...@@ -373,6 +374,7 @@ &main_sdhci0 { ...@@ -373,6 +374,7 @@ &main_sdhci0 {
&main_sdhci1 { &main_sdhci1 {
/* SD card */ /* SD card */
status = "okay";
pinctrl-0 = <&main_mmc1_pins_default>; pinctrl-0 = <&main_mmc1_pins_default>;
pinctrl-names = "default"; pinctrl-names = "default";
disable-wp; disable-wp;
......
...@@ -737,6 +737,7 @@ main_sdhci0: mmc@4f80000 { ...@@ -737,6 +737,7 @@ main_sdhci0: mmc@4f80000 {
mmc-hs200-1_8v; mmc-hs200-1_8v;
mmc-hs400-1_8v; mmc-hs400-1_8v;
dma-coherent; dma-coherent;
status = "disabled";
}; };
main_sdhci1: mmc@4fb0000 { main_sdhci1: mmc@4fb0000 {
...@@ -766,6 +767,7 @@ main_sdhci1: mmc@4fb0000 { ...@@ -766,6 +767,7 @@ main_sdhci1: mmc@4fb0000 {
dma-coherent; dma-coherent;
/* Masking support for SDR104 capability */ /* Masking support for SDR104 capability */
sdhci-caps-mask = <0x00000003 0x00000000>; sdhci-caps-mask = <0x00000003 0x00000000>;
status = "disabled";
}; };
main_navss: bus@30000000 { main_navss: bus@30000000 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment