From 2b1d7965c7e74e1b31ff29a966eaf6334b0d7057 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Carsten=20Spie=C3=9F?= <mail@carsten-spiess.de>
Date: Wed, 12 Jul 2023 10:16:27 +0200
Subject: [PATCH] octeon: ubnt-edgerouter-e300: fix missing MTD partition
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

The MAC addresses should be read from 3rd MTD partition,
but only two MTD partitions are populated.

To fix it, a partitions node has to surround the partition
nodes in device tree.

Tested with Edgerouter 6P

Signed-off-by: Carsten Spieß <mail@carsten-spiess.de>
(fixed checkpatch complains)
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
---
 .../cn7130_ubnt_edgerouter-e300.dtsi          | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 deletions(-)

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 e63598fc974a..855736b2091a 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
@@ -99,22 +99,28 @@
 		reg = <0>;
 		spi-max-frequency = <25000000>;
 
-		partition@0 {
-			label = "boot0";
-			read-only;
-			reg = <0x000000 0x300000>;
-		};
-
-		partition@300000 {
-			label = "dummy";
-			read-only;
-			reg = <0x300000 0x100000>;
-		};
-
-		eeprom: partition@400000 {
-			label = "eeprom";
-			read-only;
-			reg = <0x400000 0x10000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "boot0";
+				read-only;
+				reg = <0x000000 0x300000>;
+			};
+
+			partition@300000 {
+				label = "dummy";
+				read-only;
+				reg = <0x300000 0x100000>;
+			};
+
+			eeprom: partition@400000 {
+				label = "eeprom";
+				read-only;
+				reg = <0x400000 0x10000>;
+			};
 		};
 	};
 };
-- 
2.30.2