[PATCH 1/2] pico-imx6: Add DM_SERIAL support

[PATCH 1/2] pico-imx6: Add DM_SERIAL support

[Fabio Estevam]

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

Signed-off-by: Fabio Estevam <festevam@denx.de>
---
 configs/pico-imx6_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configs/pico-imx6_defconfig b/configs/pico-imx6_defconfig
index a6ed013f8b..f79b7ec520 100644
--- a/configs/pico-imx6_defconfig
+++ b/configs/pico-imx6_defconfig
@@ -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
-- 
2.25.1

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

[Fabio Estevam]

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")
Signed-off-by: Fabio Estevam <festevam@denx.de>
---
 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

diff --git a/arch/arm/dts/imx6dl-pico-u-boot.dtsi b/arch/arm/dts/imx6dl-pico-u-boot.dtsi
new file mode 100644
index 0000000000..e2ef9bcc14
--- /dev/null
+++ b/arch/arm/dts/imx6dl-pico-u-boot.dtsi
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+
+/ {
+	aliases {
+		mmc0 = &usdhc3;
+	};
+};
-- 
2.25.1

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

[sbabic]

> 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")
> Signed-off-by: Fabio Estevam <festevam@denx.de>
Applied to u-boot-imx, next, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
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: sbabic@denx.de
=====================================================================

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

[Fabio Estevam]

Hi Tom and Stefano,

On Wed, Mar 29, 2023 at 7:25 PM <sbabic@denx.de> wrote:
>
> > 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")
> > Signed-off-by: Fabio Estevam <festevam@denx.de>
> Applied to u-boot-imx, next, thanks !

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

Thanks

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

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 1006 bytes --]

On Mon, Apr 03, 2023 at 09:25:11AM -0300, Fabio Estevam wrote:
> Hi Tom and Stefano,
> 
> On Wed, Mar 29, 2023 at 7:25 PM <sbabic@denx.de> wrote:
> >
> > > 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")
> > > Signed-off-by: Fabio Estevam <festevam@denx.de>
> > 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.

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[PATCH 1/2] pico-imx6: Add DM_SERIAL support

[sbabic]

> The conversion to DM_SERIAL is mandatory, so add support
> for it.
> Signed-off-by: Fabio Estevam <festevam@denx.de>
Applied to u-boot-imx, next, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
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: sbabic@denx.de
=====================================================================