2021-04-30 13:56:36

by Michal Vokáč

Subject: [PATCH] ARM: dts: imx6dl-yapp4: Use aliases to set custom MMC device indexes

Until commit fa2d0aa96941 ("mmc: core: Allow setting slot index via
device tree alias") was introduced, our usdhc3 and usdhc4 devices
were enumerated as mmc0 and mmc1. The mmc1 device is used to boot/update
the board and its name must be fixed.

With the referenced commit, aliases from imx6qdl.dtsi took effect.
Override the aliases to get back the original device indexes.

Signed-off-by: Michal Vokáč <[email protected]>
---
arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 2 ++
1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi b/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi
index 686dab57a1e4..ff8d335ee482 100644
--- a/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi
+++ b/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi
@@ -11,6 +11,8 @@
aliases: aliases {
ethernet1 = &eth1;
ethernet2 = &eth2;
+ mmc0 = &usdhc3;
+ mmc1 = &usdhc4;
};

backlight: backlight {
--
2.1.4

2021-05-23 02:03:49

by Shawn Guo

Subject: Re: [PATCH] ARM: dts: imx6dl-yapp4: Use aliases to set custom MMC device indexes

On Fri, Apr 30, 2021 at 03:53:15PM +0200, Michal Vokáč wrote:
> Until commit fa2d0aa96941 ("mmc: core: Allow setting slot index via
> device tree alias") was introduced, our usdhc3 and usdhc4 devices
> were enumerated as mmc0 and mmc1. The mmc1 device is used to boot/update
> the board and its name must be fixed.
>
> With the referenced commit, aliases from imx6qdl.dtsi took effect.
> Override the aliases to get back the original device indexes.
>
> Signed-off-by: Michal Vokáč <[email protected]>

Applied, thanks.