mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 05:44:11 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
SDHCI nodes defined in the top-level AM64 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/20231117163339.89952-2-afd@ti.com
Signed-off-by: Nishanth Menon <nm@ti.com>
This commit is contained in:
Andrew Davis 2023-11-17 10:33:39 -06:00 committed by Nishanth Menon
parent 006d93519d
commit 3b6345e3fc
7 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm64/boot/dts/ti/k3-am64-main.dtsi
View file

@ -623,6 +623,7 @@ sdhci0: mmc@fa10000 {
ti,otap-del-sel-mmc-hs = <0x0>;
ti,otap-del-sel-ddr52 = <0x6>;
ti,otap-del-sel-hs200 = <0x7>;
status = "disabled";
};
sdhci1: mmc@fa00000 {
@ -641,6 +642,7 @@ sdhci1: mmc@fa00000 {
ti,otap-del-sel-sdr104 = <0x6>;
ti,otap-del-sel-ddr50 = <0x9>;
ti,clkbuf-sel = <0x7>;
status = "disabled";
};
cpsw3g: ethernet@8000000 {

1
arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi
View file

@ -211,6 +211,7 @@ flash@0 {
};
&sdhci0 {
status = "okay";
bus-width = <8>;
non-removable;
ti,driver-strength-ohm = <50>;

6
arch/arm64/boot/dts/ti/k3-am642-evm.dts
View file

@ -491,17 +491,19 @@ eeprom@0 {
};
};
/* eMMC */
&sdhci0 {
/* emmc */
status = "okay";
bus-width = <8>;
non-removable;
ti,driver-strength-ohm = <50>;
disable-wp;
};
/* SD/MMC */
&sdhci1 {
/* SD/MMC */
bootph-all;
status = "okay";
vmmc-supply = <&vdd_mmc1>;
pinctrl-names = "default";
bus-width = <4>;

1
arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dts
View file

@ -264,6 +264,7 @@ &main_uart1 {
};
&sdhci1 {
status = "okay";
vmmc-supply = <&vcc_3v3_mmc>;
pinctrl-names = "default";
pinctrl-0 = <&main_mmc1_pins_default>;

4
arch/arm64/boot/dts/ti/k3-am642-sk.dts
View file

@ -443,6 +443,7 @@ &mcu_gpio_intr {
};
&sdhci0 {
status = "okay";
vmmc-supply = <&wlan_en>;
bus-width = <4>;
non-removable;
@ -462,9 +463,10 @@ wlcore: wlcore@2 {
};
};
/* SD/MMC */
&sdhci1 {
/* SD/MMC */
bootph-all;
status = "okay";
vmmc-supply = <&vdd_mmc1>;
pinctrl-names = "default";
bus-width = <4>;

1
arch/arm64/boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts
View file

@ -425,7 +425,6 @@ &sdhci1 {
ti,driver-strength-ohm = <50>;
ti,fails-without-test-cd;
/* Enabled by overlay */
status = "disabled";
};
&tscadc0 {

1
arch/arm64/boot/dts/ti/k3-am642-tqma64xxl.dtsi
View file

@ -219,6 +219,7 @@ partitions {
};
&sdhci0 {
status = "okay";
non-removable;
disable-wp;
no-sdio;