Message ID | 20230215182444.2878162-2-festevam@denx.de |
---|---|
State | Accepted |
Commit | 5fddcbbdabff6b4f37cf81d1c06f93a5ced3eb2a |
Delegated to: | Stefano Babic |
Headers | show |
Series | [1/2] pico-imx6: Add DM_SERIAL support | expand |
> 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
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
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.
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; + }; +};
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