github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 11:03:43 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

arm64: dts: ti: k3-am62*: Move eMMC pinmux to top level board file

Browse Source 
This moves pinmux child nodes for sdhci0 node from k3-am62x-sk-common
to each top level board file. This is needed since we require internal
pullups for AM62x SK and not for AM62 LP SK since it has external
pullups on DATA 1-7.

Internal pulls are required for AM62 SK as per JESD84 spec
recommendation to prevent unconnected lines floating.

Fixes: d19a66ae48 ("arm64: dts: ti: k3-am625-sk: Enable on board peripherals")
Cc: stable@vger.kernel.org
Signed-off-by: Judith Mendez <jm@ti.com>
Link: https://lore.kernel.org/r/20250707190830.3951619-1-jm@ti.com
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
This commit is contained in:
Judith Mendez 2025-07-07 14:08:30 -05:00 committed by Vignesh Raghavendra
parent 8e44ac61ab
commit a0b8da0415
3 changed files with 48 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts
View File

@ -74,6 +74,22 @@ vddshv_sdio: regulator-4 {
}; };
&main_pmx0 { &main_pmx0 {
main_mmc0_pins_default: main-mmc0-default-pins {
bootph-all;
pinctrl-single,pins = <
AM62X_IOPAD(0x220, PIN_INPUT, 0) /* (V3) MMC0_CMD */
AM62X_IOPAD(0x218, PIN_INPUT, 0) /* (Y1) MMC0_CLK */
AM62X_IOPAD(0x214, PIN_INPUT, 0) /* (V2) MMC0_DAT0 */
AM62X_IOPAD(0x210, PIN_INPUT, 0) /* (V1) MMC0_DAT1 */
AM62X_IOPAD(0x20c, PIN_INPUT, 0) /* (W2) MMC0_DAT2 */
AM62X_IOPAD(0x208, PIN_INPUT, 0) /* (W1) MMC0_DAT3 */
AM62X_IOPAD(0x204, PIN_INPUT, 0) /* (Y2) MMC0_DAT4 */
AM62X_IOPAD(0x200, PIN_INPUT, 0) /* (W3) MMC0_DAT5 */
AM62X_IOPAD(0x1fc, PIN_INPUT, 0) /* (W4) MMC0_DAT6 */
AM62X_IOPAD(0x1f8, PIN_INPUT, 0) /* (V4) MMC0_DAT7 */
>;
};
vddshv_sdio_pins_default: vddshv-sdio-default-pins { vddshv_sdio_pins_default: vddshv-sdio-default-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
AM62X_IOPAD(0x07c, PIN_OUTPUT, 7) /* (M19) GPMC0_CLK.GPIO0_31 */ AM62X_IOPAD(0x07c, PIN_OUTPUT, 7) /* (M19) GPMC0_CLK.GPIO0_31 */
@ -144,6 +160,14 @@ exp2: gpio@23 {
}; };
}; };
&sdhci0 {
bootph-all;
non-removable;
pinctrl-names = "default";
pinctrl-0 = <&main_mmc0_pins_default>;
status = "okay";
};
&sdhci1 { &sdhci1 {
vmmc-supply = <&vdd_mmc1>; vmmc-supply = <&vdd_mmc1>;
vqmmc-supply = <&vddshv_sdio>; vqmmc-supply = <&vddshv_sdio>;

24
arch/arm64/boot/dts/ti/k3-am625-sk.dts
View File

@ -106,6 +106,22 @@ vcc_1v8: regulator-5 {
}; };
&main_pmx0 { &main_pmx0 {
main_mmc0_pins_default: main-mmc0-default-pins {
bootph-all;
pinctrl-single,pins = <
AM62X_IOPAD(0x220, PIN_INPUT, 0) /* (Y3) MMC0_CMD */
AM62X_IOPAD(0x218, PIN_INPUT, 0) /* (AB1) MMC0_CLK */
AM62X_IOPAD(0x214, PIN_INPUT, 0) /* (AA2) MMC0_DAT0 */
AM62X_IOPAD(0x210, PIN_INPUT_PULLUP, 0) /* (AA1) MMC0_DAT1 */
AM62X_IOPAD(0x20c, PIN_INPUT_PULLUP, 0) /* (AA3) MMC0_DAT2 */
AM62X_IOPAD(0x208, PIN_INPUT_PULLUP, 0) /* (Y4) MMC0_DAT3 */
AM62X_IOPAD(0x204, PIN_INPUT_PULLUP, 0) /* (AB2) MMC0_DAT4 */
AM62X_IOPAD(0x200, PIN_INPUT_PULLUP, 0) /* (AC1) MMC0_DAT5 */
AM62X_IOPAD(0x1fc, PIN_INPUT_PULLUP, 0) /* (AD2) MMC0_DAT6 */
AM62X_IOPAD(0x1f8, PIN_INPUT_PULLUP, 0) /* (AC2) MMC0_DAT7 */
>;
};
main_rgmii2_pins_default: main-rgmii2-default-pins { main_rgmii2_pins_default: main-rgmii2-default-pins {
bootph-all; bootph-all;
pinctrl-single,pins = < pinctrl-single,pins = <
@ -195,6 +211,14 @@ exp1: gpio@22 {
}; };
}; };
&sdhci0 {
bootph-all;
non-removable;
pinctrl-names = "default";
pinctrl-0 = <&main_mmc0_pins_default>;
status = "okay";
};
&sdhci1 { &sdhci1 {
vmmc-supply = <&vdd_mmc1>; vmmc-supply = <&vdd_mmc1>;
vqmmc-supply = <&vdd_sd_dv>; vqmmc-supply = <&vdd_sd_dv>;

24
arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
View File

@ -203,22 +203,6 @@ AM62X_IOPAD(0x0b4, PIN_INPUT_PULLUP, 1) /* (K24/H19) GPMC0_CSn3.I2C2_SDA */
>; >;
}; };
main_mmc0_pins_default: main-mmc0-default-pins {
bootph-all;
pinctrl-single,pins = <
AM62X_IOPAD(0x220, PIN_INPUT, 0) /* (Y3/V3) MMC0_CMD */
AM62X_IOPAD(0x218, PIN_INPUT, 0) /* (AB1/Y1) MMC0_CLK */
AM62X_IOPAD(0x214, PIN_INPUT, 0) /* (AA2/V2) MMC0_DAT0 */
AM62X_IOPAD(0x210, PIN_INPUT, 0) /* (AA1/V1) MMC0_DAT1 */
AM62X_IOPAD(0x20c, PIN_INPUT, 0) /* (AA3/W2) MMC0_DAT2 */
AM62X_IOPAD(0x208, PIN_INPUT, 0) /* (Y4/W1) MMC0_DAT3 */
AM62X_IOPAD(0x204, PIN_INPUT, 0) /* (AB2/Y2) MMC0_DAT4 */
AM62X_IOPAD(0x200, PIN_INPUT, 0) /* (AC1/W3) MMC0_DAT5 */
AM62X_IOPAD(0x1fc, PIN_INPUT, 0) /* (AD2/W4) MMC0_DAT6 */
AM62X_IOPAD(0x1f8, PIN_INPUT, 0) /* (AC2/V4) MMC0_DAT7 */
>;
};
main_mmc1_pins_default: main-mmc1-default-pins { main_mmc1_pins_default: main-mmc1-default-pins {
bootph-all; bootph-all;
pinctrl-single,pins = < pinctrl-single,pins = <
@ -457,14 +441,6 @@ &main_i2c2 {
clock-frequency = <400000>; clock-frequency = <400000>;
}; };
&sdhci0 {
bootph-all;
status = "okay";
non-removable;
pinctrl-names = "default";
pinctrl-0 = <&main_mmc0_pins_default>;
};
&sdhci1 { &sdhci1 {
/* SD/MMC */ /* SD/MMC */
bootph-all; bootph-all;