Message ID | 20190118174014.17860-6-bryan.odonoghue@linaro.org |
---|---|
State | Awaiting Upstream |
Delegated to: | Stefano Babic |
Headers | show |
Series | Convert i.MX7 WaRP7 ports to DM | expand |
> This patch sets up an alias for mmc0 to usdhc3. > Before the DM conversion only usdhc3 was enabled and therefore it appeared > as MMC 0 to u-boot. After enabling MMC DM though usdhc3 defaults to MMC 2, > which left unattended would drive changes to existing warp7 bootscripts and > environment variables that rely on mmc 0. > Setup the alias of mmc0 and usdhc3 so that existing warp7 boot code will > work unmodified. > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > Cc: Albert Aribaud <albert.u.boot@aribaud.net> > Cc: Peng Fan <peng.fan@nxp.com> > Cc: Fabio Estevam <fabio.estevam@nxp.com> > Cc: Stefano Babic <sbabic@denx.de> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic
diff --git a/arch/arm/dts/imx7s-warp.dts b/arch/arm/dts/imx7s-warp.dts index f7ba2c0a24..d28b7ec715 100644 --- a/arch/arm/dts/imx7s-warp.dts +++ b/arch/arm/dts/imx7s-warp.dts @@ -17,6 +17,10 @@ reg = <0x80000000 0x20000000>; }; + aliases { + mmc0 = &usdhc3; + }; + gpio-keys { compatible = "gpio-keys"; pinctrl-0 = <&pinctrl_gpio>;
This patch sets up an alias for mmc0 to usdhc3. Before the DM conversion only usdhc3 was enabled and therefore it appeared as MMC 0 to u-boot. After enabling MMC DM though usdhc3 defaults to MMC 2, which left unattended would drive changes to existing warp7 bootscripts and environment variables that rely on mmc 0. Setup the alias of mmc0 and usdhc3 so that existing warp7 boot code will work unmodified. Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: Peng Fan <peng.fan@nxp.com> Cc: Fabio Estevam <fabio.estevam@nxp.com> Cc: Stefano Babic <sbabic@denx.de> --- arch/arm/dts/imx7s-warp.dts | 4 ++++ 1 file changed, 4 insertions(+)