[openwrt/openwrt] octeon: ubnt-edgerouter-4/6p: devicetree cleanup

[LEDE Commits]

chunkeey pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/056742885e12871086953e7ca01cd7bdfe507830

commit 056742885e12871086953e7ca01cd7bdfe507830
Author: Carsten Spieß <mail at carsten-spiess.de>
AuthorDate: Wed Jul 12 10:24:11 2023 +0200

    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 at carsten-spiess.de>
    (integrated eeprom referenced node in the .dtsi)
    Signed-off-by: Christian Lamparter <chunkeey at gmail.com>
    (cherry picked from commit 700f11aaadb7baa38285ed8f928e976a29a72eed)
---
 .../dts/cavium-octeon/cn7130_ubnt_edgerouter-4.dts  | 10 ----------
 .../dts/cavium-octeon/cn7130_ubnt_edgerouter-6p.dts |  9 ---------
 .../cavium-octeon/cn7130_ubnt_edgerouter-e300.dtsi  | 21 ++++++++++-----------
 3 files changed, 10 insertions(+), 30 deletions(-)

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 75e2c794b9..f8d511b599 100644
--- 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 at 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 c1a41cbf70..f354d08199 100644
--- 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 at 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 855736b209..9be52f9175 100644
--- 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 at 400000 {
+			partition at 400000 {
+				compatible = "nvmem-cells";
+				reg = <0x400000 0x10000>;
 				label = "eeprom";
 				read-only;
-				reg = <0x400000 0x10000>;
+
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				macaddr_eeprom_0: macaddr at 0 {
+					reg = <0x0 0x6>;
+				};
 			};
 		};
 	};
@@ -213,12 +221,3 @@
 	};
 };
 
-&eeprom {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_eeprom_0: macaddr at 0 {
-		reg = <0x0 0x6>;
-	};
-};