wandboard: Pass mmc aliases
Subsystems (2)
Fabio Estevam
reviewerPATCH v2 1/2 wandboard: Pass mmc aliases
From: Fabio Estevam <[email protected]>
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.
---
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
arch/arm/dts/imx6dl-wandboard-revd1-u-boot.dtsi new file +1 -0
@@ -0,0 +1 @@ +#include "imx6qdl-wandboard-u-boot.dtsi"
arch/arm/dts/imx6q-wandboard-revd1-u-boot.dtsi new file +1 -0
@@ -0,0 +1 @@ +#include "imx6qdl-wandboard-u-boot.dtsi"
arch/arm/dts/imx6qdl-wandboard-u-boot.dtsi new file +9 -0
@@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include "imx6qdl-u-boot.dtsi" + +/ { + aliases { + mmc0 = &usdhc3; + }; +};
arch/arm/dts/imx6qp-wandboard-revd1-u-boot.dtsi new file +1 -0
@@ -0,0 +1 @@ +#include "imx6qdl-wandboard-u-boot.dtsi"
Signature · 1 line
2.25.1
Fabio Estevam
reviewerPATCH v2 2/2 wandboard: Select DM_SERIAL
From: Fabio Estevam <[email protected]>
The conversion to DM_SERIAL is mandatory, so select this option.
---
Changes since v1:
- None
configs/wandboard_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/wandboard_defconfig +1 -0
@@ -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
Signature · 1 line
2.25.1
PATCH v2 2/2 wandboard: Select DM_SERIAL
Quoted 4 lines
From: Fabio Estevam <[email protected]>
The conversion toDM_SERIALis mandatory, so select this option.Signed-off-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v2 1/2 wandboard: Pass mmc aliases
In reply to Fabio EstevamQuoted 14 lines
From: Fabio Estevam <[email protected]>
Originally, the mmc aliases node was present inimx6qdl-wandboard.dtsi. After the sync with Linux in commitd0399a46e7cd("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
Quoted 7 lines
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.dtsifile 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 <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
Fabio Estevam
reviewerHi Tom and Stefano,
Quoted 27 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
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: 2Loading 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.dtsifile to restore the original behaviour where the SD card (esdhc3) was mapped to mmc0.
Quoted 5 lines
Fixes d0399a46e7cd ("imx6dl/imx6qdl: synchronise device trees with linux")Signed-off-by Fabio Estevam <[email protected]>---
Changes since v1:
- Add patch numbering.
Please consider applying this one to 2023.01 to fix the boot regression.
Thanks
Fabio Estevam
reviewerHi Tom,
Quoted 31 lines · Fabio Estevam
Hi Tom and Stefano,
Quoted 27 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
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: 2Loading 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.dtsifile to restore the original behaviour where the SD card (esdhc3) was mapped to mmc0.
Quoted 7 lines
Quoted 5 lines
Fixes d0399a46e7cd ("imx6dl/imx6qdl: synchronise device trees with linux")Signed-off-by Fabio Estevam <[email protected]>---
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
Quoted 40 lines · Fabio Estevam
Hi Tom,
Quoted 37 lines · Fabio Estevam
Hi Tom and Stefano,
Quoted 32 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
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: 2Loading 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.dtsifile 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 <[email protected]>---
Changes since v1:
- Add patch numbering.
Quoted 3 lines
Quoted 1 line
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 <[email protected]> AuthorDate: Fri Nov 4 08:12:54 2022 -0300 Commit: Stefano Babic <[email protected]> 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.
Signature · 1 line
Tom
Fabio Estevam
reviewerQuoted 2 lines · Tom Rini
It's already been merged:
commitf827f84d3f5607d0b33e927f6127a888e7bd664f
Ok, great! I haven't received any message saying it has been applied, so that's why I missed it.
Thanks