Fix LAN (now working)

Selfnet · May 19, 2024 · 258e64f · 258e64f
1 parent 6ec70bf
commit 258e64f
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 32 deletions.
diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -60,7 +60,8 @@ ipq40xx_setup_interfaces()
 	mikrotik,sxtsq-5-ac|\
 	netgear,ex6100v2|\
 	netgear,ex6150v2|\
-	zte,mf282plus)
+	zte,mf282plus|\
+	huawei,ap4050dn)
 		ucidef_set_interface_lan "lan"
 		;;
 	avm,fritzbox-7530)

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-ap4050dn.dts b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-ap4050dn.dts
@@ -19,6 +19,11 @@
 			status = "okay";
 		};
 
+		counter@4a1000 {
+			compatible = "qcom,qca-gcnt";
+			reg = <0x4a1000 0x4>;
+		};
+
 		tcsr@1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -53,6 +58,23 @@
 		hw_margin_ms = <100>;
 		always-running;
 	};
+
+	virtual_flash {
+		compatible = "mtd-concat";
+		devices = <&fwconcat0 &fwconcat1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "firmware";
+				reg = <0x0 0x3200000>;
+				compatible = "openwrt,uimage", "denx,uimage";
+			};
+		};
+	};
 };
 
 &tlmm {
@@ -191,8 +213,9 @@
 				reg = <0x600000 0x100000>;
 			};
 
-			partition@700000 {
-				label = "SysImageA";
+			// In the vendor layout, the partion "SysImageA" lies here
+			fwconcat0: partition@700000 {
+				label = "fwconcat0";
 				reg = <0x700000 0x1900000>;
 			};
 
@@ -246,8 +269,9 @@
 				reg = <0x2600000 0x100000>;
 			};
 
-			partition@2700000 {
-				label = "SysImageB";
+			// In the vendor layout, the partion "SysImageB" lies here
+			fwconcat1: partition@2700000 {
+				label = "fwconcat1";
 				reg = <0x2700000 0x1900000>;
 			};
 		};
@@ -262,15 +286,15 @@
 
 &wifi0 {
 	status = "okay";
-	qcom,ath10k-calibration-variant = "Huawei-AP4050DN";
+	//qcom,ath10k-calibration-variant = "Huawei-AP4050DN";
 
 	nvmem-cell-names = "pre-calibration";
 	nvmem-cells = <&precal_art_1000>;
 };
 
 &wifi1 {
 	status = "okay";
-	qcom,ath10k-calibration-variant = "Huawei-AP4050DN";
+	//qcom,ath10k-calibration-variant = "Huawei-AP4050DN";
 
 	nvmem-cell-names = "pre-calibration";
 	nvmem-cells = <&precal_art_5000>;
@@ -288,34 +312,11 @@
 	status = "okay";
 };
 
-&swport1 {
+&switch {
 	status = "okay";
-	label = "ethernet1";
-};
-
-&swport2 {
-	status = "okay";
-	label = "ethernet2";
-};
-
-&swport3 {
-	status = "okay";
-	label = "ethernet3";
 };
 
 &swport4 {
 	status = "okay";
-	label = "ethernet4";
+	label = "lan";
 };
-
-&swport5 {
-	status = "okay";
-	label = "ethernet5";
-};
-
-
-
-
-// &switch {
-// 	status = "okay";
-// };