mirror of
https://github.com/torvalds/linux.git
synced 2026-06-03 12:03:54 +02:00
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>
This commit is contained in:
parent
05a1f13010
commit
6fbd1310f9
|
|
@ -563,6 +563,7 @@ &main_uart0 {
|
|||
|
||||
&main_sdhci0 {
|
||||
/* eMMC */
|
||||
status = "okay";
|
||||
non-removable;
|
||||
ti,driver-strength-ohm = <50>;
|
||||
disable-wp;
|
||||
|
|
@ -570,6 +571,7 @@ &main_sdhci0 {
|
|||
|
||||
&main_sdhci1 {
|
||||
/* SD Card */
|
||||
status = "okay";
|
||||
vmmc-supply = <&vdd_mmc1>;
|
||||
vqmmc-supply = <&vdd_sd_dv_alt>;
|
||||
pinctrl-names = "default";
|
||||
|
|
@ -578,11 +580,6 @@ &main_sdhci1 {
|
|||
disable-wp;
|
||||
};
|
||||
|
||||
&main_sdhci2 {
|
||||
/* Unused */
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
&ospi0 {
|
||||
/* Unused */
|
||||
status = "disabled";
|
||||
|
|
|
|||
|
|
@ -504,6 +504,7 @@ &wkup_gpio1 {
|
|||
|
||||
&main_sdhci0 {
|
||||
/* eMMC */
|
||||
status = "okay";
|
||||
non-removable;
|
||||
ti,driver-strength-ohm = <50>;
|
||||
disable-wp;
|
||||
|
|
@ -511,6 +512,7 @@ &main_sdhci0 {
|
|||
|
||||
&main_sdhci1 {
|
||||
/* SD/MMC */
|
||||
status = "okay";
|
||||
vmmc-supply = <&vdd_mmc1>;
|
||||
vqmmc-supply = <&vdd_sd_dv_alt>;
|
||||
pinctrl-names = "default";
|
||||
|
|
@ -519,11 +521,6 @@ &main_sdhci1 {
|
|||
disable-wp;
|
||||
};
|
||||
|
||||
&main_sdhci2 {
|
||||
/* Unused */
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
&usb_serdes_mux {
|
||||
idle-states = <1>, <0>; /* USB0 to SERDES3, USB1 to SERDES1 */
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1479,6 +1479,7 @@ main_sdhci0: mmc@4f80000 {
|
|||
ti,itap-del-sel-ddr52 = <0x3>;
|
||||
ti,trm-icp = <0x8>;
|
||||
dma-coherent;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
main_sdhci1: mmc@4fb0000 {
|
||||
|
|
@ -1506,6 +1507,7 @@ main_sdhci1: mmc@4fb0000 {
|
|||
ti,clkbuf-sel = <0x7>;
|
||||
dma-coherent;
|
||||
sdhci-caps-mask = <0x2 0x0>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
main_sdhci2: mmc@4f98000 {
|
||||
|
|
@ -1533,6 +1535,7 @@ main_sdhci2: mmc@4f98000 {
|
|||
ti,clkbuf-sel = <0x7>;
|
||||
dma-coherent;
|
||||
sdhci-caps-mask = <0x2 0x0>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
usbss0: cdns-usb@4104000 {
|
||||
|
|
|
|||
|
|
@ -582,13 +582,9 @@ &main_uart1 {
|
|||
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 @@ &main_sdhci1 {
|
|||
disable-wp;
|
||||
};
|
||||
|
||||
&main_sdhci2 {
|
||||
/* Unused */
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
&ospi0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&mcu_fss0_ospi0_pins_default>;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user