Skip to contentSkip to conversation

pico-imx6: Add DM_SERIAL support

PATCH New Fabio Estevam 4 participants 6 messages Feb 15, 2023 – Apr 3, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 pico-imx6: Add DM_SERIAL support

The conversion to DM_SERIAL is mandatory, so add support for it.

---
 configs/pico-imx6_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/pico-imx6_defconfig +1 -0
index a6ed013f8b..f79b7ec520 100644
@@ -83,6 +83,7 @@ CONFIG_RGMII=y
 CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
+CONFIG_DM_SERIAL=y
 CONFIG_MXC_UART=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/2 pico-imx6: Pass the mmc alias to fix boot regression

Originally, the mmc aliases node was present in imx6qdl-pico.dtsi.

After the sync with Linux in commit d0399a46e7cd ("imx6dl/imx6qdl:
synchronise device trees with linux"), the aliases node is gone as the upstream version does not have it.

This causes a boot regression in which the eMMC card cannot be found anymore.

Fix it by passing the alias node in the u-boot.dtsi file to restore the original behaviour where the eMMC (esdhc3) was mapped to mmc0.

Fixes d0399a46e7cd ("imx6dl/imx6qdl: synchronise device trees with linux")
---
 arch/arm/dts/imx6dl-pico-u-boot.dtsi | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 arch/arm/dts/imx6dl-pico-u-boot.dtsi
arch/arm/dts/imx6dl-pico-u-boot.dtsi new file +7 -0
new file mode 100644
index 0000000000..e2ef9bcc14
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+
+/ {
+	aliases {
+		mmc0 = &usdhc3;
+	};
+};
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/2 pico-imx6: Pass the mmc alias to fix boot regression

Quoted 6 lines

Originally, the mmc aliases node was present in imx6qdl-pico.dtsi.

After the sync with Linux in commit d0399a46e7cd ("imx6dl/imx6qdl:
synchronise device trees with linux"), the aliases node is gone as the upstream version does not have it.

Quoted 8 lines

This causes a boot regression in which the eMMC card cannot be found anymore.

Fix it by passing the alias node in the u-boot.dtsi file to restore the original behaviour where the eMMC (esdhc3) was mapped to mmc0.

Fixes d0399a46e7cd ("imx6dl/imx6qdl: synchronise device trees with linux")

Applied to u-boot-imx, next, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,        Managing Director: Erika Unter  
HRB 165235 Munich,   Office: Kirchenstr.5, 82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
reviewer
#3 lore raw

Re: [PATCH 2/2] pico-imx6: Pass the mmc alias to fix boot regression

Hi Tom and Stefano,

Quoted 9 lines · On Wed, Mar 29, 2023 at 7:25 PM <[email protected]> wrote:
Quoted 9 lines

Originally, the mmc aliases node was present in imx6qdl-pico.dtsi.

After the sync with Linux in commit d0399a46e7cd ("imx6dl/imx6qdl:
synchronise device trees with linux"), the aliases node is gone as the upstream version does not have it.

This causes a boot regression in which the eMMC card cannot be found anymore.

Quoted 7 lines
Quoted 6 lines

Fix it by passing the alias node in the u-boot.dtsi file to restore the original behaviour where the eMMC (esdhc3) was mapped to mmc0.

Fixes d0399a46e7cd ("imx6dl/imx6qdl: synchronise device trees with linux")

Applied to u-boot-imx, next, thanks !

Since this one fixes a boot regression, could it be applied to 2023.04?

Thanks

#4 lore raw

Re: [PATCH 2/2] pico-imx6: Pass the mmc alias to fix boot regression

Quoted 16 lines · Fabio Estevam

Hi Tom and Stefano,

Quoted 13 lines · On Wed, Mar 29, 2023 at 7:25 PM <[email protected]> wrote:
Quoted 13 lines

Originally, the mmc aliases node was present in imx6qdl-pico.dtsi.

After the sync with Linux in commit d0399a46e7cd ("imx6dl/imx6qdl:
synchronise device trees with linux"), the aliases node is gone as the upstream version does not have it.

This causes a boot regression in which the eMMC card cannot be found anymore.

Fix it by passing the alias node in the u-boot.dtsi file to restore the original behaviour where the eMMC (esdhc3) was mapped to mmc0.

Quoted 5 lines
Quoted 3 lines
Quoted 2 lines
Fixes d0399a46e7cd ("imx6dl/imx6qdl: synchronise device trees with linux")

Applied to u-boot-imx, next, thanks !

Since this one fixes a boot regression, could it be applied to 2023.04?

I have cherry-picked this to master.

Signature · 1 line
Tom
#5 lore raw

PATCH 1/2 pico-imx6: Add DM_SERIAL support

In reply to Fabio Estevam
Quoted 3 lines

The conversion to DM_SERIAL is mandatory, so add support for it.

Applied to u-boot-imx, next, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,        Managing Director: Erika Unter  
HRB 165235 Munich,   Office: Kirchenstr.5, 82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================