linux-kernel - [PATCH V4 3/4] ARM: dts: imx6ull-dhcor: Remove mmc aliases from DHCOR SoM

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20230407104943.5794-3-cniedermaier@dh-electronics.com>
Date:   Fri, 7 Apr 2023 12:49:42 +0200
From:   Christoph Niedermaier <cniedermaier@...electronics.com>
To:     <linux-arm-kernel@...ts.infradead.org>
CC:     Christoph Niedermaier <cniedermaier@...electronics.com>,
        Rob Herring <robh+dt@...nel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>,
        Shawn Guo <shawnguo@...nel.org>, Li Yang <leoyang.li@....com>,
        Marek Vasut <marex@...x.de>, Fabio Estevam <festevam@...x.de>,
        NXP Linux Team <linux-imx@....com>,
        <kernel@...electronics.com>, <devicetree@...r.kernel.org>,
        <linux-kernel@...r.kernel.org>
Subject: [PATCH V4 3/4] 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@...electronics.com>
---
Cc: Rob Herring <robh+dt@...nel.org>
Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>
Cc: Shawn Guo <shawnguo@...nel.org>
Cc: Li Yang <leoyang.li@....com>
Cc: Marek Vasut <marex@...x.de>
Cc: Fabio Estevam <festevam@...x.de>
Cc: NXP Linux Team <linux-imx@....com>
Cc: kernel@...electronics.com
Cc: devicetree@...r.kernel.org
Cc: linux-kernel@...r.kernel.org
To: linux-arm-kernel@...ts.infradead.org
---
V3: - Add this patch to the series
V4: - Remove mmc /delete-property/ entries from the aliases node in
      the DHCOM SoM layer
---
 arch/arm/boot/dts/imx6ull-dhcom-som.dtsi | 2 --
 arch/arm/boot/dts/imx6ull-dhcor-som.dtsi | 5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/imx6ull-dhcom-som.dtsi b/arch/arm/boot/dts/imx6ull-dhcom-som.dtsi
index 17837663c0b0..830b5a5064f2 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 5882c7565f64..a386c1e9bed3 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@...00000 {
 		/* Appropriate memory size will be filled by U-Boot */
 		reg = <0x80000000 0>;
-- 
2.11.0