[PATCH v2 1/2] wandboard: Pass mmc aliases

[PATCH v2 1/2] wandboard: Pass mmc aliases

[Fabio Estevam]

From: Fabio Estevam <festevam@denx.de>

Originally, the mmc aliases node was present in imx6qdl-wandboard.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 regression in which the SD card cannot be found anymore:

Since commit  the aliases node has been removed
U-Boot 2022.10-00999-gcca41ed3d63f-dirty (Nov 03 2022 - 22:07:38 -0300)

CPU:   Freescale i.MX6QP rev1.0 at 792 MHz
Reset cause: POR
DRAM:  2 GiB
Core:  62 devices, 17 uclasses, devicetree: separate
PMIC:  PFUZE100 ID=0x10
MMC:   FSL_SDHC: 0, FSL_SDHC: 1, FSL_SDHC: 2
Loading Environment from MMC... MMC: no card present
*** Warning - No block device, using default environment

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

Fixes: d0399a46e7cd ("imx6dl/imx6qdl: synchronise device trees with linux")
Signed-off-by: Fabio Estevam <festevam@denx.de>
---
Changes since v1:
- Add patch numbering.

 arch/arm/dts/imx6dl-wandboard-revd1-u-boot.dtsi | 1 +
 arch/arm/dts/imx6q-wandboard-revd1-u-boot.dtsi  | 1 +
 arch/arm/dts/imx6qdl-wandboard-u-boot.dtsi      | 9 +++++++++
 arch/arm/dts/imx6qp-wandboard-revd1-u-boot.dtsi | 1 +
 4 files changed, 12 insertions(+)
 create mode 100644 arch/arm/dts/imx6dl-wandboard-revd1-u-boot.dtsi
 create mode 100644 arch/arm/dts/imx6q-wandboard-revd1-u-boot.dtsi
 create mode 100644 arch/arm/dts/imx6qdl-wandboard-u-boot.dtsi
 create mode 100644 arch/arm/dts/imx6qp-wandboard-revd1-u-boot.dtsi

diff --git a/arch/arm/dts/imx6dl-wandboard-revd1-u-boot.dtsi b/arch/arm/dts/imx6dl-wandboard-revd1-u-boot.dtsi
new file mode 100644
index 000000000000..6785db754b79
--- /dev/null
+++ b/arch/arm/dts/imx6dl-wandboard-revd1-u-boot.dtsi
@@ -0,0 +1 @@
+#include "imx6qdl-wandboard-u-boot.dtsi"
diff --git a/arch/arm/dts/imx6q-wandboard-revd1-u-boot.dtsi b/arch/arm/dts/imx6q-wandboard-revd1-u-boot.dtsi
new file mode 100644
index 000000000000..6785db754b79
--- /dev/null
+++ b/arch/arm/dts/imx6q-wandboard-revd1-u-boot.dtsi
@@ -0,0 +1 @@
+#include "imx6qdl-wandboard-u-boot.dtsi"
diff --git a/arch/arm/dts/imx6qdl-wandboard-u-boot.dtsi b/arch/arm/dts/imx6qdl-wandboard-u-boot.dtsi
new file mode 100644
index 000000000000..46c4b3b31f4a
--- /dev/null
+++ b/arch/arm/dts/imx6qdl-wandboard-u-boot.dtsi
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include "imx6qdl-u-boot.dtsi"
+
+/ {
+	aliases {
+		mmc0 = &usdhc3;
+	};
+};
diff --git a/arch/arm/dts/imx6qp-wandboard-revd1-u-boot.dtsi b/arch/arm/dts/imx6qp-wandboard-revd1-u-boot.dtsi
new file mode 100644
index 000000000000..6785db754b79
--- /dev/null
+++ b/arch/arm/dts/imx6qp-wandboard-revd1-u-boot.dtsi
@@ -0,0 +1 @@
+#include "imx6qdl-wandboard-u-boot.dtsi"
-- 
2.25.1

[PATCH v2 2/2] wandboard: Select DM_SERIAL

[Fabio Estevam]

From: Fabio Estevam <festevam@denx.de>

The conversion to DM_SERIAL is mandatory, so select this
option.

Signed-off-by: Fabio Estevam <festevam@denx.de>
---
Changes since v1:
- None

 configs/wandboard_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig
index 70b4cf9ffaa3..33d9db56e1cb 100644
--- a/configs/wandboard_defconfig
+++ b/configs/wandboard_defconfig
@@ -72,6 +72,7 @@ CONFIG_PINCTRL_IMX6=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_PMIC_PFUZE100=y
 CONFIG_DM_SCSI=y
+CONFIG_DM_SERIAL=y
 CONFIG_MXC_UART=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
-- 
2.25.1

[PATCH v2 2/2] wandboard: Select DM_SERIAL

[sbabic]

> From: Fabio Estevam <festevam@denx.de>
> The conversion to DM_SERIAL is mandatory, so select this
> option.
> Signed-off-by: Fabio Estevam <festevam@denx.de>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================

[PATCH v2 1/2] wandboard: Pass mmc aliases

[sbabic]

> From: Fabio Estevam <festevam@denx.de>
> Originally, the mmc aliases node was present in imx6qdl-wandboard.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 regression in which the SD card cannot be found anymore:
> Since commit  the aliases node has been removed
> U-Boot 2022.10-00999-gcca41ed3d63f-dirty (Nov 03 2022 - 22:07:38 -0300)
> CPU:   Freescale i.MX6QP rev1.0 at 792 MHz
> Reset cause: POR
> DRAM:  2 GiB
> Core:  62 devices, 17 uclasses, devicetree: separate
> PMIC:  PFUZE100 ID=0x10
> MMC:   FSL_SDHC: 0, FSL_SDHC: 1, FSL_SDHC: 2
> Loading Environment from MMC... MMC: no card present
> *** Warning - No block device, using default environment
> Fix it by passing the alias node in the u-boot.dtsi file to
> restore the original behaviour where the SD card (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, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================

Re: [PATCH v2 1/2] wandboard: Pass mmc aliases

[Fabio Estevam]

Hi Tom and Stefano,

On Fri, Nov 4, 2022 at 8:13 AM Fabio Estevam <festevam@gmail.com> wrote:
>
> From: Fabio Estevam <festevam@denx.de>
>
> Originally, the mmc aliases node was present in imx6qdl-wandboard.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 regression in which the SD card cannot be found anymore:
>
> Since commit  the aliases node has been removed
> U-Boot 2022.10-00999-gcca41ed3d63f-dirty (Nov 03 2022 - 22:07:38 -0300)
>
> CPU:   Freescale i.MX6QP rev1.0 at 792 MHz
> Reset cause: POR
> DRAM:  2 GiB
> Core:  62 devices, 17 uclasses, devicetree: separate
> PMIC:  PFUZE100 ID=0x10
> MMC:   FSL_SDHC: 0, FSL_SDHC: 1, FSL_SDHC: 2
> Loading Environment from MMC... MMC: no card present
> *** Warning - No block device, using default environment
>
> Fix it by passing the alias node in the u-boot.dtsi file to
> restore the original behaviour where the SD card (esdhc3) was
> mapped to mmc0.
>
> Fixes: d0399a46e7cd ("imx6dl/imx6qdl: synchronise device trees with linux")
> Signed-off-by: Fabio Estevam <festevam@denx.de>
> ---
> Changes since v1:
> - Add patch numbering.

Please consider applying this one to 2023.01 to fix the boot regression.

Thanks

Re: [PATCH v2 1/2] wandboard: Pass mmc aliases

[Fabio Estevam]

Hi Tom,

On Tue, Jan 3, 2023 at 8:00 AM Fabio Estevam <festevam@gmail.com> wrote:
>
> Hi Tom and Stefano,
>
> On Fri, Nov 4, 2022 at 8:13 AM Fabio Estevam <festevam@gmail.com> wrote:
> >
> > From: Fabio Estevam <festevam@denx.de>
> >
> > Originally, the mmc aliases node was present in imx6qdl-wandboard.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 regression in which the SD card cannot be found anymore:
> >
> > Since commit  the aliases node has been removed
> > U-Boot 2022.10-00999-gcca41ed3d63f-dirty (Nov 03 2022 - 22:07:38 -0300)
> >
> > CPU:   Freescale i.MX6QP rev1.0 at 792 MHz
> > Reset cause: POR
> > DRAM:  2 GiB
> > Core:  62 devices, 17 uclasses, devicetree: separate
> > PMIC:  PFUZE100 ID=0x10
> > MMC:   FSL_SDHC: 0, FSL_SDHC: 1, FSL_SDHC: 2
> > Loading Environment from MMC... MMC: no card present
> > *** Warning - No block device, using default environment
> >
> > Fix it by passing the alias node in the u-boot.dtsi file to
> > restore the original behaviour where the SD card (esdhc3) was
> > mapped to mmc0.
> >
> > Fixes: d0399a46e7cd ("imx6dl/imx6qdl: synchronise device trees with linux")
> > Signed-off-by: Fabio Estevam <festevam@denx.de>
> > ---
> > Changes since v1:
> > - Add patch numbering.
>
> Please consider applying this one to 2023.01 to fix the boot regression.

Could you please apply this one directly to 2023.01 to fix the boot regression?

Thanks

Re: [PATCH v2 1/2] wandboard: Pass mmc aliases

[Tom Rini]

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

On Sun, Jan 08, 2023 at 08:36:21AM -0300, Fabio Estevam wrote:
> Hi Tom,
> 
> On Tue, Jan 3, 2023 at 8:00 AM Fabio Estevam <festevam@gmail.com> wrote:
> >
> > Hi Tom and Stefano,
> >
> > On Fri, Nov 4, 2022 at 8:13 AM Fabio Estevam <festevam@gmail.com> wrote:
> > >
> > > From: Fabio Estevam <festevam@denx.de>
> > >
> > > Originally, the mmc aliases node was present in imx6qdl-wandboard.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 regression in which the SD card cannot be found anymore:
> > >
> > > Since commit  the aliases node has been removed
> > > U-Boot 2022.10-00999-gcca41ed3d63f-dirty (Nov 03 2022 - 22:07:38 -0300)
> > >
> > > CPU:   Freescale i.MX6QP rev1.0 at 792 MHz
> > > Reset cause: POR
> > > DRAM:  2 GiB
> > > Core:  62 devices, 17 uclasses, devicetree: separate
> > > PMIC:  PFUZE100 ID=0x10
> > > MMC:   FSL_SDHC: 0, FSL_SDHC: 1, FSL_SDHC: 2
> > > Loading Environment from MMC... MMC: no card present
> > > *** Warning - No block device, using default environment
> > >
> > > Fix it by passing the alias node in the u-boot.dtsi file to
> > > restore the original behaviour where the SD card (esdhc3) was
> > > mapped to mmc0.
> > >
> > > Fixes: d0399a46e7cd ("imx6dl/imx6qdl: synchronise device trees with linux")
> > > Signed-off-by: Fabio Estevam <festevam@denx.de>
> > > ---
> > > Changes since v1:
> > > - Add patch numbering.
> >
> > Please consider applying this one to 2023.01 to fix the boot regression.
> 
> Could you please apply this one directly to 2023.01 to fix the boot regression?

It's already been merged:
commit f827f84d3f5607d0b33e927f6127a888e7bd664f
Author:     Fabio Estevam <festevam@denx.de>
AuthorDate: Fri Nov 4 08:12:54 2022 -0300
Commit:     Stefano Babic <sbabic@denx.de>
CommitDate: Wed Nov 9 17:12:31 2022 +0100

    wandboard: Pass mmc aliases
    
    Originally, the mmc aliases node was present in imx6qdl-wandboard.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 regression in which the SD card cannot be found anymore:
    
    Since commit  the aliases node has been removed
    U-Boot 2022.10-00999-gcca41ed3d63f-dirty (Nov 03 2022 - 22:07:38 -0300)
    
    CPU:   Freescale i.MX6QP rev1.0 at 792 MHz
    Reset cause: POR
    DRAM:  2 GiB
    Core:  62 devices, 17 uclasses, devicetree: separate
    PMIC:  PFUZE100 ID=0x10
    MMC:   FSL_SDHC: 0, FSL_SDHC: 1, FSL_SDHC: 2
    Loading Environment from MMC... MMC: no card present
    *** Warning - No block device, using default environment
    
    Fix it by passing the alias node in the u-boot.dtsi file to
    restore the original behaviour where the SD card (esdhc3) was
    mapped to mmc0.
    
    Fixes: d0399a46e7cd ("imx6dl/imx6qdl: synchronise device trees with linux")
    Signed-off-by: Fabio Estevam <festevam@denx.de>

-- 
Tom

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

Re: [PATCH v2 1/2] wandboard: Pass mmc aliases

[Fabio Estevam]

On Sun, Jan 8, 2023 at 11:58 AM Tom Rini <trini@konsulko.com> wrote:

> It's already been merged:
> commit f827f84d3f5607d0b33e927f6127a888e7bd664f

Ok, great! I haven't received any message saying it has been applied,
so that's why I missed it.

Thanks