octeon: ubnt-edgerouter-4/6p: devicetree cleanup

removed redundant eeprom partition nodes from
cn7130_ubnt_edgerouter-4.dts and cn7130_ubnt_edgerouter-6p.dts
as they are identically defined in cn7130_ubnt_edgerouter-e300.dtsi.

Signed-off-by: Carsten Spieß <mail@carsten-spiess.de>
(integrated eeprom referenced node in the .dtsi)
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
(cherry picked from commit 700f11aaadb7baa38285ed8f928e976a29a72eed)

diff --git a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-4.dts b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-4.dts
index 75e2c794b9e665602393484753a5a2fb791bf854..f8d511b599012d4895831678e52479f6d7c6e4fb 100644 (file)
--- a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-4.dts
+++ b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-4.dts
@@ -19,13 +19,3 @@
                };
        };
 };
-
-&eeprom {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_eeprom_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-6p.dts b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-6p.dts
index c1a41cbf705da78e1dc35da63370eece995ae879..f354d08199a866839cf283fd5ed2789087c5e613 100644 (file)
--- a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-6p.dts
+++ b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-6p.dts
@@ -62,12 +62,3 @@
        };
 };
 
-&eeprom {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_eeprom_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-e300.dtsi b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-e300.dtsi
index 855736b2091a5bfb5aed7bd7cc4bf65456c17774..9be52f917592f37fbf598108bd6ba6dba0b4fbff 100644 (file)
--- a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-e300.dtsi
+++ b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-e300.dtsi
@@ -116,10 +116,18 @@
                                reg = <0x300000 0x100000>;
                        };
 
-                       eeprom: partition@400000 {
+                       partition@400000 {
+                               compatible = "nvmem-cells";
+                               reg = <0x400000 0x10000>;
                                label = "eeprom";
                                read-only;
-                               reg = <0x400000 0x10000>;
+
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_eeprom_0: macaddr@0 {
+                                       reg = <0x0 0x6>;
+                               };
                        };
                };
        };
@@ -213,12 +221,3 @@
        };
 };
 
-&eeprom {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_eeprom_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};