Browse Source

ipq40xx: Convert openmesh,a62 to DSA

* ethernet1:

  - physical port label "Ethernet 1"
  - can be used to power the device
  - its mac address is printed on the device label

* ethernet2:

  - physical port label "Ethernet 2"

Both ports are not marked by there role (because the vendor firmware
automatically detects roles) but the "Ethernet 1" port was used in the past
for "WAN" functionality in OpenWrt.

Reviewed-by: Robert Marko <[email protected]>
Tested-by: Michaël BILCOT <[email protected]>
Signed-off-by: Sven Eckelmann <[email protected]>
Sven Eckelmann 3 năm trước cách đây
mục cha
commit
c6bef1b83a

+ 4 - 2
target/linux/ipq40xx/base-files/etc/board.d/02_network

@@ -73,7 +73,8 @@ ipq40xx_setup_interfaces()
 	netgear,srs60)
 	netgear,srs60)
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan"
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan"
 		;;
 		;;
-	openmesh,a42)
+	openmesh,a42|\
+	openmesh,a62)
 		ucidef_set_interfaces_lan_wan "ethernet2" "ethernet1"
 		ucidef_set_interfaces_lan_wan "ethernet2" "ethernet1"
 		;;
 		;;
 	zte,mf286d)
 	zte,mf286d)
@@ -162,7 +163,8 @@ ipq40xx_setup_macs()
 	pakedge,wr-1)
 	pakedge,wr-1)
 		wan_mac=$(macaddr_add $(get_mac_label) 1)
 		wan_mac=$(macaddr_add $(get_mac_label) 1)
 		;;
 		;;
-	openmesh,a42)
+	openmesh,a42|\
+	openmesh,a62)
 		label_mac="$(mtd_get_mac_binary "0:ART" 0x0)"
 		label_mac="$(mtd_get_mac_binary "0:ART" 0x0)"
 		;;
 		;;
 	esac
 	esac

+ 2 - 1
target/linux/ipq40xx/base-files/lib/preinit/05_set_iface_mac_ipq40xx.sh

@@ -29,7 +29,8 @@ preinit_set_mac_address() {
 		ip link set dev lan1 address $(macaddr_add "$base_mac" 1)
 		ip link set dev lan1 address $(macaddr_add "$base_mac" 1)
 		ip link set dev eth0 address $(macaddr_setbit "$base_mac" 7)
 		ip link set dev eth0 address $(macaddr_setbit "$base_mac" 7)
 		;;
 		;;
-	openmesh,a42)
+	openmesh,a42|\
+	openmesh,a62)
 		ip link set dev ethernet1 address $(mtd_get_mac_binary "0:ART" 0x0)
 		ip link set dev ethernet1 address $(mtd_get_mac_binary "0:ART" 0x0)
 		ip link set dev ethernet2 address $(mtd_get_mac_binary "0:ART" 0x6)
 		ip link set dev ethernet2 address $(mtd_get_mac_binary "0:ART" 0x6)
 		;;
 		;;

+ 22 - 4
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-a62.dts

@@ -17,10 +17,6 @@
 			status = "okay";
 			status = "okay";
 		};
 		};
 
 
-		mdio@90000 {
-			status = "okay";
-		};
-
 		tcsr@194b000 {
 		tcsr@194b000 {
 			/* select hostmode */
 			/* select hostmode */
 			compatible = "qcom,tcsr";
 			compatible = "qcom,tcsr";
@@ -194,6 +190,28 @@
 	};
 	};
 };
 };
 
 
+&mdio {
+	status = "okay";
+};
+
+&gmac {
+	status = "okay";
+};
+
+&switch {
+	status = "okay";
+};
+
+&swport4 {
+	status = "okay";
+	label = "ethernet1";
+};
+
+&swport5 {
+	status = "okay";
+	label = "ethernet2";
+};
+
 &wifi0 {
 &wifi0 {
 	status = "okay";
 	status = "okay";
 	qcom,ath10k-calibration-variant = "OM-A62";
 	qcom,ath10k-calibration-variant = "OM-A62";

+ 1 - 2
target/linux/ipq40xx/image/generic.mk

@@ -904,8 +904,7 @@ define Device/openmesh_a62
 	IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-rootfs | sysupgrade-tar rootfs=$$$$@ | append-metadata
 	IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-rootfs | sysupgrade-tar rootfs=$$$$@ | append-metadata
 	DEVICE_PACKAGES := ath10k-firmware-qca9888-ct
 	DEVICE_PACKAGES := ath10k-firmware-qca9888-ct
 endef
 endef
-# Missing DSA Setup
-#TARGET_DEVICES += openmesh_a62
+TARGET_DEVICES += openmesh_a62
 
 
 define Device/p2w_r619ac
 define Device/p2w_r619ac
 	$(call Device/FitzImage)
 	$(call Device/FitzImage)