From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Mon, 30 Jan 2023 12:39:06 +0000 (+0100)
Subject: ARM: arm: colibri-imx6ull-emmc: fix emmc access
X-Git-Tag: v2023.04-rc2~25^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3655bbb1398644e0b336a3ebde25be8c42424ff;p=pandora-u-boot.git

ARM: arm: colibri-imx6ull-emmc: fix emmc access

Synchronizing the device tree with linux introduced a regression.
The U-Boot specific dtsi mustn't override the alias settings for
the eMMC/SD interfaces.

Without this U-Boot cannot access the eMMC and boot the kernel.

Fixes: c21b61bff15 ("colibri-imx6ull/-emmc: synchronise device tree with linux")
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---

diff --git a/arch/arm/dts/imx6ull-colibri-eval-v3-u-boot.dtsi b/arch/arm/dts/imx6ull-colibri-eval-v3-u-boot.dtsi
index 65dfeab5bb2..0a732269bab 100644
--- a/arch/arm/dts/imx6ull-colibri-eval-v3-u-boot.dtsi
+++ b/arch/arm/dts/imx6ull-colibri-eval-v3-u-boot.dtsi
@@ -6,7 +6,6 @@
 / {
 	aliases {
 		u-boot,dm-pre-reloc;
-		mmc0 = &usdhc1;
 		usb0 = &usbotg1; /* required for ums */
 		display0 = &lcdif;
 	};