imx8mn-evk.dtsi, which is also used for the DDR4 variant, already contains
everything we customize in imx8mn-evk for the LPDDR4 variant, so drop
the duplication.
Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
---
arch/arm/dts/imx8mn-evk.dts | 83 ------------------------------------
arch/arm/dts/imx8mn-evk.dtsi | 2 +
2 files changed, 2 insertions(+), 83 deletions(-)
diff --git a/arch/arm/dts/imx8mn-evk.dts b/arch/arm/dts/imx8mn-evk.dts
index fb2e40ed898a..eb6e1312f4cb 100644
--- a/arch/arm/dts/imx8mn-evk.dts
+++ b/arch/arm/dts/imx8mn-evk.dts
@@ -4,86 +4,3 @@
#include <arm64/freescale/imx8mn-evk.dts>
#include "imx8mn-evk.dtsi"
-#include "imx8mn.dtsi"
-
-/ {
- chosen {
- environment-sd {
- compatible = "barebox,environment";
- device-path = &env_sd2;
- status = "disabled";
- };
- environment-emmc {
- compatible = "barebox,environment";
- device-path = &env_sd3;
- status = "disabled";
- };
- };
-};
-
-&fec1 {
- phy-reset-gpios = <&gpio4 22 GPIO_ACTIVE_LOW>;
-};
-
-&usdhc2 {
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition@0 {
- label = "barebox";
- reg = <0x0 0xe0000>;
- };
-
- env_sd2: partition@e0000 {
- label = "barebox-environment";
- reg = <0xe0000 0x20000>;
- };
-};
-
-&usdhc3 {
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition@0 {
- label = "barebox";
- reg = <0x0 0xe0000>;
- };
-
- env_sd3: partition@e0000 {
- label = "barebox-environment";
- reg = <0xe0000 0x20000>;
- };
-};
-
-&ocotp {
- barebox,provide-mac-address = <&fec1 0x640>;
-};
-
-&iomuxc {
- pinctrl_flexspi0: flexspi0grp {
- fsl,pins = <
- MX8MN_IOMUXC_NAND_ALE_QSPI_A_SCLK 0x1c4
- MX8MN_IOMUXC_NAND_CE0_B_QSPI_A_SS0_B 0x84
- MX8MN_IOMUXC_NAND_DATA00_QSPI_A_DATA0 0x84
- MX8MN_IOMUXC_NAND_DATA01_QSPI_A_DATA1 0x84
- MX8MN_IOMUXC_NAND_DATA02_QSPI_A_DATA2 0x84
- MX8MN_IOMUXC_NAND_DATA03_QSPI_A_DATA3 0x84
- >;
- };
-};
-
-&flexspi {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_flexspi0>;
-
- system_flash: flash@0 {
- reg = <0>;
- compatible = "jedec,spi-nor";
- spi-max-frequency = <80000000>;
- spi-tx-bus-width = <4>;
- spi-rx-bus-width = <4>;
- #address-cells = <1>;
- #size-cells = <1>;
- };
-};
diff --git a/arch/arm/dts/imx8mn-evk.dtsi b/arch/arm/dts/imx8mn-evk.dtsi
index b55b2f324f12..d15f66ff403b 100644
--- a/arch/arm/dts/imx8mn-evk.dtsi
+++ b/arch/arm/dts/imx8mn-evk.dtsi
@@ -4,6 +4,8 @@
* Copyright (C) 2017 Pengutronix, Lucas Stach <kernel@xxxxxxxxxxxxxx>
*/
+#include "imx8mn.dtsi"
+
/ {
chosen {
environment-sd {
--
2.30.2
