| Message ID | 20230407104943.5794-3-cniedermaier@dh-electronics.com |
|---|---|
| State | Accepted |
| Commit | 97dadebe5fa69a32b82fb64cfec87d2e8c63ed2e |
| Headers | show |
| Series | [V4,1/4] dt-bindings: Add Marantec vendor prefix | expand |
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@80000000 { /* Appropriate memory size will be filled by U-Boot */ reg = <0x80000000 0>;
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> --- Cc: Rob Herring <robh+dt@kernel.org> Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> Cc: Shawn Guo <shawnguo@kernel.org> Cc: Li Yang <leoyang.li@nxp.com> Cc: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <festevam@denx.de> Cc: NXP Linux Team <linux-imx@nxp.com> Cc: kernel@dh-electronics.com Cc: devicetree@vger.kernel.org Cc: linux-kernel@vger.kernel.org To: linux-arm-kernel@lists.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(-)