[openwrt/openwrt] octeon: ubnt-edgerouter-e300: fix missing MTD partition

LEDE Commits lede-commits at lists.infradead.org
Wed Jul 19 13:23:41 PDT 2023


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

commit 4959dcd698bb06e76560fad65265d7804643e18b
Author: Carsten Spieß <mail at carsten-spiess.de>
AuthorDate: Wed Jul 12 10:16:27 2023 +0200

    octeon: ubnt-edgerouter-e300: fix missing MTD partition
    
    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 at carsten-spiess.de>
    (fixed checkpatch complains)
    Signed-off-by: Christian Lamparter <chunkeey at gmail.com>
    (cherry picked from commit 2b1d7965c7e74e1b31ff29a966eaf6334b0d7057)
---
 .../cavium-octeon/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 e63598fc97..855736b209 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 at 0 {
-			label = "boot0";
-			read-only;
-			reg = <0x000000 0x300000>;
-		};
-
-		partition at 300000 {
-			label = "dummy";
-			read-only;
-			reg = <0x300000 0x100000>;
-		};
-
-		eeprom: partition at 400000 {
-			label = "eeprom";
-			read-only;
-			reg = <0x400000 0x10000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "boot0";
+				read-only;
+				reg = <0x000000 0x300000>;
+			};
+
+			partition at 300000 {
+				label = "dummy";
+				read-only;
+				reg = <0x300000 0x100000>;
+			};
+
+			eeprom: partition at 400000 {
+				label = "eeprom";
+				read-only;
+				reg = <0x400000 0x10000>;
+			};
 		};
 	};
 };




More information about the lede-commits mailing list