| From stable+bounces-172419-greg=kroah.com@vger.kernel.org Fri Aug 22 16:20:03 2025 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 22 Aug 2025 10:16:12 -0400 |
| Subject: arm64: dts: ti: k3-am6*: Add boot phase flag to support MMC boot |
| To: stable@vger.kernel.org |
| Cc: Judith Mendez <jm@ti.com>, Moteen Shah <m-shah@ti.com>, Nishanth Menon <nm@ti.com>, Sasha Levin <sashal@kernel.org> |
| Message-ID: <20250822141615.1255693-1-sashal@kernel.org> |
| |
| From: Judith Mendez <jm@ti.com> |
| |
| [ Upstream commit db3cd905b8c8cd40f15a34e30a225704bb8a2fcb ] |
| |
| The bootph-all flag was introduced in dt-schema |
| (dtschema/schemas/bootph.yaml) to define node usage across |
| different boot phases. |
| |
| For eMMC and SD boot modes, voltage regulator nodes, io-expander |
| nodes, gpio nodes, and MMC nodes need to be present in all boot |
| stages, so add missing bootph-all phase flag to these nodes to |
| support SD boot and eMMC boot. |
| |
| Signed-off-by: Judith Mendez <jm@ti.com> |
| Reviewed-by: Moteen Shah <m-shah@ti.com> |
| Link: https://lore.kernel.org/r/20250429151454.4160506-2-jm@ti.com |
| Signed-off-by: Nishanth Menon <nm@ti.com> |
| Stable-dep-of: a0b8da04153e ("arm64: dts: ti: k3-am62*: Move eMMC pinmux to top level board file") |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts | 12 ++++++++++++ |
| arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 2 ++ |
| 2 files changed, 14 insertions(+) |
| |
| --- a/arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts |
| +++ b/arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts |
| @@ -69,6 +69,7 @@ |
| gpios = <&main_gpio0 31 GPIO_ACTIVE_HIGH>; |
| states = <1800000 0x0>, |
| <3300000 0x1>; |
| + bootph-all; |
| }; |
| }; |
| |
| @@ -77,12 +78,14 @@ |
| pinctrl-single,pins = < |
| AM62X_IOPAD(0x07c, PIN_OUTPUT, 7) /* (M19) GPMC0_CLK.GPIO0_31 */ |
| >; |
| + bootph-all; |
| }; |
| |
| main_gpio1_ioexp_intr_pins_default: main-gpio1-ioexp-intr-default-pins { |
| pinctrl-single,pins = < |
| AM62X_IOPAD(0x01d4, PIN_INPUT, 7) /* (C13) UART0_RTSn.GPIO1_23 */ |
| >; |
| + bootph-all; |
| }; |
| |
| pmic_irq_pins_default: pmic-irq-default-pins { |
| @@ -118,6 +121,7 @@ |
| |
| pinctrl-names = "default"; |
| pinctrl-0 = <&main_gpio1_ioexp_intr_pins_default>; |
| + bootph-all; |
| }; |
| |
| exp2: gpio@23 { |
| @@ -229,6 +233,14 @@ |
| DVDD-supply = <&buck2_reg>; |
| }; |
| |
| +&main_gpio0 { |
| + bootph-all; |
| +}; |
| + |
| +&main_gpio1 { |
| + bootph-all; |
| +}; |
| + |
| &gpmc0 { |
| ranges = <0 0 0x00 0x51000000 0x01000000>; /* CS0 space. Min partition = 16MB */ |
| }; |
| --- a/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts |
| +++ b/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts |
| @@ -301,6 +301,7 @@ |
| AM62AX_IOPAD(0x1fc, PIN_INPUT_PULLUP, 0) /* (AD2) MMC0_DAT6 */ |
| AM62AX_IOPAD(0x1f8, PIN_INPUT_PULLUP, 0) /* (AC2) MMC0_DAT7 */ |
| >; |
| + bootph-all; |
| }; |
| |
| main_mmc1_pins_default: main-mmc1-default-pins { |
| @@ -603,6 +604,7 @@ |
| pinctrl-names = "default"; |
| pinctrl-0 = <&main_mmc0_pins_default>; |
| disable-wp; |
| + bootph-all; |
| }; |
| |
| &sdhci1 { |
