[openwrt/openwrt] mediatek: filogic: wax220: cleanup device tree

[LEDE Commits]

blocktrron pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/f445c382637111c212131e3f14708d27f6bc60ca

commit f445c382637111c212131e3f14708d27f6bc60ca
Author: Stefan Agner <stefan at agner.ch>
AuthorDate: Fri Jun 30 12:34:38 2023 +0200

    mediatek: filogic: wax220: cleanup device tree
    
    Fix compatible string to match what is supported upstream, fix alignment
    and order MTD partitions according to offset.
    
    Signed-off-by: Stefan Agner <stefan at agner.ch>
    (cherry picked from commit 4af06aaf33c9256a5d3e960fa5f6bddab2674c5a)
---
 package/boot/uboot-envtools/files/mediatek_filogic |  2 +-
 .../linux/mediatek/dts/mt7986b-netgear-wax220.dts  | 97 ++++++++++------------
 2 files changed, 47 insertions(+), 52 deletions(-)

diff --git a/package/boot/uboot-envtools/files/mediatek_filogic b/package/boot/uboot-envtools/files/mediatek_filogic
index 4fb1af8218..f13beed526 100644
--- a/package/boot/uboot-envtools/files/mediatek_filogic
+++ b/package/boot/uboot-envtools/files/mediatek_filogic
@@ -45,7 +45,7 @@ mercusys,mr90x-v1)
 	ubootenv_add_uci_config "$envdev" "0x0" "0x20000" "0x20000" "1"
 	;;
 netgear,wax220)
-	ubootenv_add_uci_config "/dev/mtd5" "0x0" "0x20000" "0x20000"
+	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x20000"
 	;;
 xiaomi,mi-router-wr30u-112m-nmbm|\
 xiaomi,mi-router-wr30u-stock|\
diff --git a/target/linux/mediatek/dts/mt7986b-netgear-wax220.dts b/target/linux/mediatek/dts/mt7986b-netgear-wax220.dts
index ac2a4b0824..09fdf67786 100644
--- a/target/linux/mediatek/dts/mt7986b-netgear-wax220.dts
+++ b/target/linux/mediatek/dts/mt7986b-netgear-wax220.dts
@@ -8,10 +8,8 @@
 #include "mt7986b.dtsi"
 
 / {
-	#address-cells = <0x2>;
-	#size-cells = <0x2>;
 	model = "Netgear WAX220";
-	compatible = "netgear,wax220", "mediatek,mt7986b-spim-snand-rfb";
+	compatible = "netgear,wax220", "mediatek,mt7986b";
 
 	aliases {
 		serial0 = &uart0;
@@ -106,8 +104,6 @@
 };
 
 &mdio {
-	#address-cells = <1>;
-	#size-cells = <0>;
 	phy6: ethernet-phy at 6 {
 		reg = <6>;
 		reset-assert-us = <100000>;
@@ -120,7 +116,6 @@
 	};
 };
 
-
 &pio {
 	spi_flash_pins: spi-flash-pins-33-to-38 {
 		mux {
@@ -145,13 +140,13 @@
 			groups = "wf_2g", "wf_5g";
 		};
 		conf {
-			pins =  "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
-				"WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
-				"WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
-				"WF0_TOP_CLK", "WF0_TOP_DATA", "WF1_HB1",
-				"WF1_HB2", "WF1_HB3", "WF1_HB4", "WF1_HB0",
-				"WF1_HB5", "WF1_HB6", "WF1_HB7", "WF1_HB8",
-				"WF1_TOP_CLK", "WF1_TOP_DATA";
+			pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
+			       "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
+			       "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
+			       "WF0_TOP_CLK", "WF0_TOP_DATA", "WF1_HB1",
+			       "WF1_HB2", "WF1_HB3", "WF1_HB4", "WF1_HB0",
+			       "WF1_HB5", "WF1_HB6", "WF1_HB7", "WF1_HB8",
+			       "WF1_TOP_CLK", "WF1_TOP_DATA";
 			drive-strength = <4>;
 		};
 	};
@@ -163,9 +158,9 @@
 		};
 		conf {
 			pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
-			 "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
-			 "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
-			 "WF0_TOP_CLK", "WF0_TOP_DATA";
+			       "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
+			       "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
+			       "WF0_TOP_CLK", "WF0_TOP_DATA";
 			drive-strength = <4>;
 		};
 	};
@@ -196,19 +191,15 @@
 			#size-cells = <0x1>;
 			compatible = "fixed-partitions";
 
-			partition at 5fc0000 {
-				label = "Traffic";
-				reg = <0x5fc0000 0x200000>;
-			};
-
-			partition at 63c0000 {
-				label = "NTGRcryptD";
-				reg = <0x63c0000 0x500000>;
+			partition at 0 {
+				label = "BL2";
+				read-only;
+				reg = <0x0 0x100000>;
 			};
 
-			partition at 580000 {
-				label = "ubi";
-				reg = <0x580000 0x5140000>;
+			partition at 100000 {
+				label = "u-boot-env";
+				reg = <0x100000 0x80000>;
 			};
 
 			factory: partition at 180000 {
@@ -216,19 +207,19 @@
 				reg = <0x180000 0x200000>;
 			};
 
-			partition at 69c0000 {
-				label = "User_data";
-				reg = <0x69c0000 0x640000>;
+			partition at 380000 {
+				label = "FIP";
+				reg = <0x380000 0x200000>;
 			};
 
-			partition at 100000 {
-				label = "u-boot-env";
-				reg = <0x100000 0x80000>;
+			partition at 580000 {
+				label = "ubi";
+				reg = <0x580000 0x5140000>;
 			};
 
-			partition at 68c0000 {
-				label = "LOG";
-				reg = <0x68c0000 0x100000>;
+			partition at 56c0000 {
+				label = "RAE";
+				reg = <0x56c0000 0x400000>;
 			};
 
 			partition at 5ac0000 {
@@ -236,35 +227,39 @@
 				reg = <0x5ac0000 0x100000>;
 			};
 
-			partition at 0 {
-				label = "BL2";
-				read-only;
-				reg = <0x0 0x100000>;
-			};
-
 			partition at 5bc0000 {
 				label = "Language";
 				reg = <0x5bc0000 0x400000>;
 			};
 
+			partition at 5fc0000 {
+				label = "Traffic";
+				reg = <0x5fc0000 0x200000>;
+			};
+
 			partition at 61c0000 {
 				label = "Cert";
 				reg = <0x61c0000 0x100000>;
 			};
 
-			partition at 380000 {
-				label = "FIP";
-				reg = <0x380000 0x200000>;
+			partition at 62c0000 {
+				label = "NTGRcryptK";
+				reg = <0x62c0000 0x100000>;
 			};
 
-			partition at 56c0000 {
-				label = "RAE";
-				reg = <0x56c0000 0x400000>;
+			partition at 63c0000 {
+				label = "NTGRcryptD";
+				reg = <0x63c0000 0x500000>;
 			};
 
-			partition at 62c0000 {
-				label = "NTGRcryptK";
-				reg = <0x62c0000 0x100000>;
+			partition at 68c0000 {
+				label = "LOG";
+				reg = <0x68c0000 0x100000>;
+			};
+
+			partition at 69c0000 {
+				label = "User_data";
+				reg = <0x69c0000 0x640000>;
 			};
 		};
 	};