From d178918891a1ed09711ac33ff93f7710be137826 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michal=20Vok=C3=A1=C4=8D?= Date: Fri, 30 Apr 2021 15:53:15 +0200 Subject: [PATCH] ARM: dts: imx6dl-yapp4: Use aliases to set custom MMC device indexes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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áč Signed-off-by: Shawn Guo --- 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 f2c7298aead1f..d3921f297445d 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 = ð1; ethernet2 = ð2; + mmc0 = &usdhc3; + mmc1 = &usdhc4; }; backlight: backlight { -- 2.30.2