From: Christoph Niedermaier <cniedermaier@dh-electronics.com>
Date: Fri, 7 Apr 2023 10:49:42 +0000 (+0200)
Subject: ARM: dts: imx6ull-dhcor: Remove mmc aliases from DHCOR SoM
X-Git-Tag: v6.5-rc1~142^2~22^2~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=97dadebe5fa69a32b82fb64cfec87d2e8c63ed2e;p=thirdparty%2Fkernel%2Flinux.git

ARM: dts: imx6ull-dhcor: Remove mmc aliases from DHCOR SoM

To be able to define mmc aliases correctly for a DHCOR board
remove mmc aliases from the DHCOR SoM layer.

All DHCOM SoM boards are based on the DHCOR SoM, as the DHCOR
SoM is soldered on top of the DHCOM SoM. As a result, remove
the mmc /delete-property/ entries from the aliases node in
the DHCOM SoM layer, because this is already removed in the
DHCOR SoM layer below.

Signed-off-by: Christoph Niedermaier <cniedermaier@dh-electronics.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
---

diff --git a/arch/arm/boot/dts/imx6ull-dhcom-som.dtsi b/arch/arm/boot/dts/imx6ull-dhcom-som.dtsi
index 17837663c0b0d..830b5a5064f28 100644
--- a/arch/arm/boot/dts/imx6ull-dhcom-som.dtsi
+++ b/arch/arm/boot/dts/imx6ull-dhcom-som.dtsi
@@ -7,8 +7,6 @@
 
 / {
 	aliases {
-		/delete-property/ mmc0; /* Avoid double definitions */
-		/delete-property/ mmc1;
 		/delete-property/ spi2;
 		/delete-property/ spi3;
 		i2c0 = &i2c2;
diff --git a/arch/arm/boot/dts/imx6ull-dhcor-som.dtsi b/arch/arm/boot/dts/imx6ull-dhcor-som.dtsi
index 5882c7565f649..a386c1e9bed36 100644
--- a/arch/arm/boot/dts/imx6ull-dhcor-som.dtsi
+++ b/arch/arm/boot/dts/imx6ull-dhcor-som.dtsi
@@ -11,6 +11,11 @@
 #include "imx6ull.dtsi"
 
 / {
+	aliases {
+		/delete-property/ mmc0;
+		/delete-property/ mmc1;
+	};
+
 	memory@80000000 {
 		/* Appropriate memory size will be filled by U-Boot */
 		reg = <0x80000000 0>;