1 files changed, 44 insertions, 80 deletions

diff --git a/arch/arm/dts/fsl-ls1046a-rdb.dts b/arch/arm/dts/fsl-ls1046a-rdb.dts
index 23e43701f3..37023fae9b 100644
--- a/arch/arm/dts/fsl-ls1046a-rdb.dts
+++ b/arch/arm/dts/fsl-ls1046a-rdb.dts
@@ -3,10 +3,11 @@
 /dts-v1/;
 
 #include <arm64/freescale/fsl-ls1046a-rdb.dts>
+#include "fsl-ls1046a.dtsi"
 
 / {
 	aliases {
-		eeprom = &eeprom;
+		eeprom = &{i2c0/eeprom@52};
 	};
 
 	chosen {
@@ -17,10 +18,6 @@
 			device-path = &environment_sd;
 		};
 	};
-
-	aliases {
-		mmc0 = &esdhc;
-	};
 };
 
 &esdhc {
@@ -50,83 +47,52 @@
 	status = "okay";
 };
 
-&i2c0 {
-	eeprom: eeprom@52 {
-		compatible = "atmel,24c04";
-	};
-
-	non_existent_eeprom: eeprom@53 {
-	};
+&enet0 {
+	status = "disabled";
 };
 
-/delete-node/ &non_existent_eeprom;
-
-&fman0 {
-	ethernet@e0000 {
-		status = "disabled";
-	};
-
-	ethernet@e2000 {
-		status = "disabled";
-	};
-
-	ethernet@e4000 {
-		phy-mode = "rgmii-id";
-	};
-
-	ethernet@e6000 {
-		phy-mode = "rgmii-id";
-	};
-
-	ethernet@e8000 {
-	};
-
-	ethernet@ea000 {
-	};
-
-	ethernet@f0000 {
-	};
-
-	ethernet@f2000 {
-	};
+&enet1 {
+	status = "disabled";
+};
 
-	mdio@fc000 {
-	};
+&enet2 {
+	phy-mode = "rgmii-id";
+};
 
-	mdio@fd000 {
-	};
+&enet3 {
+	phy-mode = "rgmii-id";
+};
 
-	mdio@e1000 {
-		status = "disabled";
-	};
+&{fman0/mdio@e1000} {
+	status = "disabled";
+};
 
-	mdio@e3000 {
-		status = "disabled";
-	};
+&{fman0/mdio@e3000} {
+	status = "disabled";
+};
 
-	mdio@e5000 {
-		status = "disabled";
-	};
+&{fman0/mdio@e5000} {
+	status = "disabled";
+};
 
-	mdio@e7000 {
-		status = "disabled";
-	};
+&{fman0/mdio@e7000} {
+	status = "disabled";
+};
 
-	mdio@e9000 {
-		status = "disabled";
-	};
+&{fman0/mdio@e9000} {
+	status = "disabled";
+};
 
-	mdio@eb000 {
-		status = "disabled";
-	};
+&{fman0/mdio@eb000} {
+	status = "disabled";
+};
 
-	mdio@f1000 {
-		status = "disabled";
-	};
+&{fman0/mdio@f1000} {
+	status = "disabled";
+};
 
-	mdio@f3000 {
-		status = "disabled";
-	};
+&{fman0/mdio@f3000} {
+	status = "disabled";
 };
 
 &usb0 {
@@ -143,16 +109,14 @@
 	dr_mode = "host";
 };
 
-&soc {
-	pcie1: pcie@3400000 {
-		status = "okay";
-	};
+&pcie1 {
+	status = "okay";
+};
 
-	pcie2: pcie@3500000 {
-		status = "okay";
-	};
+&pcie2 {
+	status = "okay";
+};
 
-	pcie3: pcie@3600000 {
-		status = "okay";
-	};
+&pcie3 {
+	status = "okay";
 };