ucentral-tools: the git repo is gone, move the code into the package

Signed-off-by: John Crispin <john@phrozen.org>

feeds/qca-wifi-7/ath12k-wifi/Makefile

@@ -53,11 +53,6 @@ $(call Package/ath12k-wifi-default)
     TITLE:=board-2.bin for RAP750W_311a
 endef
 
-define Package/ath12k-wifi-cig-wf189h
-$(call Package/ath12k-wifi-default)
-    TITLE:=board-2.bin for WF189H
-endef
-
 define Package/ath12k-wifi-cig-wf189w
 $(call Package/ath12k-wifi-default)
     TITLE:=board-2.bin for WF189W
@@ -101,18 +96,8 @@ define Package/ath12k-wifi-cig-wf189w/install
 	$(INSTALL_DATA) ./ipq5332_qcn6432.regdb $(1)/lib/firmware/ath12k/QCN6432/hw1.0/regdb.bin
 endef
 
-
-define Package/ath12k-wifi-cig-wf189h/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
-	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN6432/hw1.0/
-	$(INSTALL_DATA) ./board-2.bin.189h.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
-	$(INSTALL_DATA) ./board-2.bin.189h.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
-	$(INSTALL_DATA) ./ipq5332_qcn6432.regdb $(1)/lib/firmware/ath12k/QCN6432/hw1.0/regdb.bin
-endef
-
 $(eval $(call BuildPackage,ath12k-wifi-cig-wf189))
 $(eval $(call BuildPackage,ath12k-wifi-edgecore-eap105))
 $(eval $(call BuildPackage,ath12k-wifi-sonicfi-rap7110c-341x))
 $(eval $(call BuildPackage,ath12k-wifi-sonicfi-rap750w-311a))
 $(eval $(call BuildPackage,ath12k-wifi-cig-wf189w))
-$(eval $(call BuildPackage,ath12k-wifi-cig-wf189h))

feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/01_leds

@@ -11,8 +11,10 @@ sercomm,ap72tip)
 	ucidef_set_led_netdev "wan_link" "wan_link" "green:phy" "eth0" "link"
 	ucidef_set_led_netdev "wan_act" "wan_act" "yellow:phy" "eth0" "rx tx"
 	;;
-sonicfi,rap7110c-341x|\
-sonicfi,rap750w-311a)
+sonicfi,rap7110c-341x)
+	ucidef_set_led_default "power" "POWER" "pwm:blue" "on"
+	;;
+cig,wf189w)
 	ucidef_set_led_default "power" "POWER" "pwm:blue" "on"
 	;;
 esac

feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/02_network

@@ -22,12 +22,7 @@ ipq53xx_setup_interfaces()
 		ucidef_set_interfaces_lan_wan "" "eth0"
 		;;
 	cig,wf189w)
-		ucidef_set_interfaces_lan_wan "eth1" "eth0"
-		ucidef_add_switch "switch1" "0u@eth1" "3:lan" "2:lan" "1:lan"
-		;;
-	cig,wf189h)
-		ucidef_set_interfaces_lan_wan "eth1" "eth0"
-		ucidef_add_switch "switch1" "0u@eth1" "3:lan" "2:lan"
+		ucidef_add_switch "switch1" "5u@eth0" "3:lan" "2:lan" "1:lan" "0u@eth1" "4:wan"
 		;;
 	esac
 }
@@ -37,7 +32,6 @@ qcom_setup_macs()
         local board="$1"
         case $board in
 	cig,wf189w|\
-	cig,wf189h|\
         cig,wf189)
 		mtd=$(find_mtd_chardev "0:APPSBLENV")
 		[ -z "$mtd" ] && return;
@@ -56,18 +50,13 @@ qcom_setup_macs()
                 wan_mac=$(cat /sys/class/net/eth0/address)
                 lan_mac=$(macaddr_add "$wan_mac" 1)
 		;;
-        sonicfi,rap7110c-341x)
+        sonicfi,rap7110c-341x|\
+        sonicfi,rap750w-311a)
                 wan_mac=$(cat /sys/class/net/eth0/address)
                 ucidef_set_wireless_macaddr_base 2g $(macaddr_add "$wan_mac" 1)
                 ucidef_set_wireless_macaddr_base 5g $(macaddr_add "$wan_mac" 2)
                 ucidef_set_wireless_macaddr_base 6g $(macaddr_add "$wan_mac" 3)
                 ;;
-        sonicfi,rap750w-311a)
-                wan_mac=$(cat /sys/class/net/eth0/address)
-                lan_mac=$(macaddr_add "$wan_mac" 1)
-                ucidef_set_wireless_macaddr_base 2g $(macaddr_add "$wan_mac" 2)
-                ucidef_set_wireless_macaddr_base 5g $(macaddr_add "$wan_mac" 3)
-                ;;
         *)
                 wan_mac=$(cat /sys/class/net/eth1/address)
                 lan_mac=$(macaddr_add "$wan_mac" 1)

feeds/qca-wifi-7/ipq53xx/base-files/etc/hotplug.d/firmware/10-ath12k-caldata

@@ -28,7 +28,6 @@ case "$FIRMWARE" in
 ath12k/IPQ5332/hw1.0/caldata.bin)
 	case "$board" in
 	cig,wf189w|\
-	cig,wf189h|\
 	cig,wf189|\
 	edgecore,eap105|\
 	sercomm,ap72tip)
@@ -57,13 +56,12 @@ ath12k/QCN92XX/hw1.0/cal-pci-0001:01:00.0.bin)
 ath12k/QCN6432/hw1.0/caldata_1.bin)
 	case "$board" in
 	sonicfi,rap750w-311a)
-		caldata_extract "0:ART" 0x12800 0x18800
+		caldata_extract "0:ART" 0x26800 0x18800
 		;;
 	esac
 	;;
 ath12k/QCN6432/hw1.0/cal-ahb-soc@0:wifi1@c0000000.bin)
 	case "$board" in
-	cig,wf189h|\
 	cig,wf189w)
 		caldata_extract "0:ART" 0x26800 0x20000
 		;;
@@ -71,7 +69,6 @@ ath12k/QCN6432/hw1.0/cal-ahb-soc@0:wifi1@c0000000.bin)
 	;;
 ath12k/QCN6432/hw1.0/cal-ahb-soc@0:wifi2@c0000000.bin)
 	case "$board" in
-	cig,wf189h|\
 	cig,wf189w)
 		caldata_extract "0:ART" 0x58800 0x20000
 		;;

feeds/qca-wifi-7/ipq53xx/base-files/etc/init.d/smp-affinity

@@ -1,77 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-
-boot() {
-	# For CE(assigned 2 core to copy engine)
-	# using 3 core will cause firmware crash due to bss channel survey timed out
-	i=0
-	cpu_mul=2
-	ce="ce"
-	ce1="ce_"
-	ce_name="$ce$i"
-	ce_name1="$ce1$i"
-	while [ $i -lt 15 ]
-	do
-		cpu=1
-		for irq_num in `grep -e "$ce_name" -e "$ce_name1" /proc/interrupts | cut -d ':' -f 1`
-		do
-			[ -n "$irq_num" ] && echo $cpu > /proc/irq/$irq_num/smp_affinity
-			cpu=$((cpu * cpu_mul))
-			if [ $cpu -gt 4 ] ; then cpu=1; fi
-		done
-	i=$((i+1))
-	ce_name="$ce$i"
-	ce_name1="$ce1$i"
-	done
-
-	#For IPQ5332 2G radio
-	irq_affinity_num=`grep -E -m1 'reo2host-destination-ring4' /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-	[ -n "$irq_affinity_num" ] && echo 8 > /proc/irq/$irq_affinity_num/smp_affinity
-	irq_affinity_num=`grep -E -m1 'reo2host-destination-ring3' /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-	[ -n "$irq_affinity_num" ] && echo 4 > /proc/irq/$irq_affinity_num/smp_affinity
-	irq_affinity_num=`grep -E -m1 'reo2host-destination-ring2' /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-	[ -n "$irq_affinity_num" ] && echo 2 > /proc/irq/$irq_affinity_num/smp_affinity
-	irq_affinity_num=`grep -E -m1 'reo2host-destination-ring1' /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-	[ -n "$irq_affinity_num" ] && echo 1 > /proc/irq/$irq_affinity_num/smp_affinity
-	irq_affinity_num=`grep -E -m1 'wbm2host-tx-completions-ring4' /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-	[ -n "$irq_affinity_num" ] && echo 8 > /proc/irq/$irq_affinity_num/smp_affinity
-	irq_affinity_num=`grep -E -m1 'wbm2host-tx-completions-ring3' /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-	[ -n "$irq_affinity_num" ] && echo 4 > /proc/irq/$irq_affinity_num/smp_affinity
-	irq_affinity_num=`grep -E -m1 'wbm2host-tx-completions-ring2' /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-	[ -n "$irq_affinity_num" ] && echo 2 > /proc/irq/$irq_affinity_num/smp_affinity
-	irq_affinity_num=`grep -E -m1 'wbm2host-tx-completions-ring1' /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-	[ -n "$irq_affinity_num" ] && echo 1 > /proc/irq/$irq_affinity_num/smp_affinity
-	irq_affinity_num=`grep -E -m1 'reo2ost-exception' /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-	[ -n "$irq_affinity_num" ] && echo 8 > /proc/irq/$irq_affinity_num/smp_affinity
-	irq_affinity_num=`grep -E -m1 'wbm2host-rx-release' /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-	[ -n "$irq_affinity_num" ] && echo 8 > /proc/irq/$irq_affinity_num/smp_affinity
-	irq_affinity_num=`grep -E -m1 'reo2host-status' /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-	[ -n "$irq_affinity_num" ] && echo 8 > /proc/irq/$irq_affinity_num/smp_affinity
-
-	# 5G and 6G radio
-	# pci0 and pci1 for Wkiki (two radio and one radio split mode)
-	# pcic1 and pcic2 are for Pebble
-	for j in pci0 pci1 pcic1 pcic2; do
-		irq_affinity_num=`grep -E -m1 "$j"_wlan_dp_4 /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-		[ -n "$irq_affinity_num" ] && echo 1 > /proc/irq/$irq_affinity_num/smp_affinity
-		irq_affinity_num=`grep -E -m1 "$j"_wlan_dp_5 /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-		[ -n "$irq_affinity_num" ] && echo 2 > /proc/irq/$irq_affinity_num/smp_affinity
-		irq_affinity_num=`grep -E -m1 "$j"_wlan_dp_6 /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-		[ -n "$irq_affinity_num" ] && echo 4 > /proc/irq/$irq_affinity_num/smp_affinity
-		irq_affinity_num=`grep -E -m1 "$j"_wlan_dp_7 /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-		[ -n "$irq_affinity_num" ] && echo 8 > /proc/irq/$irq_affinity_num/smp_affinity
-		irq_affinity_num=`grep -E -m1 "$j"_wlan_dp_0 /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-		[ -n "$irq_affinity_num" ] && echo 1 > /proc/irq/$irq_affinity_num/smp_affinity
-		irq_affinity_num=`grep -E -m1 "$j"_wlan_dp_1 /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-		[ -n "$irq_affinity_num" ] && echo 2 > /proc/irq/$irq_affinity_num/smp_affinity
-		irq_affinity_num=`grep -E -m1 "$j"_wlan_dp_2 /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-		[ -n "$irq_affinity_num" ] && echo 4 > /proc/irq/$irq_affinity_num/smp_affinity
-		irq_affinity_num=`grep -E -m1 "$j"_wlan_dp_11 /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-		[ -n "$irq_affinity_num" ] && echo 8 > /proc/irq/$irq_affinity_num/smp_affinity
-		irq_affinity_num=`grep -E -m1 "$j"_wlan_dp_3 /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-		[ -n "$irq_affinity_num" ] && echo 8 > /proc/irq/$irq_affinity_num/smp_affinity
-		irq_affinity_num=`grep -E -m1 "$j"_wlan_dp_8 /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-		[ -n "$irq_affinity_num" ] && echo 2 > /proc/irq/$irq_affinity_num/smp_affinity
-        done
-}

feeds/qca-wifi-7/ipq53xx/base-files/lib/upgrade/platform.sh

@@ -87,7 +87,6 @@ platform_do_upgrade() {
 	board=$(board_name)
 	case $board in
 	cig,wf189w|\
-	cig,wf189h|\
 	cig,wf189)
 		if [ -f /proc/boot_info/bootconfig0/rootfs/upgradepartition ]; then
 			CI_UBIPART="$(cat /proc/boot_info/bootconfig0/rootfs/upgradepartition)"

feeds/qca-wifi-7/ipq53xx/dts/ipq5332-cig-wf189.dts

@@ -23,10 +23,6 @@
 		serial1 = &blsp1_uart1;
 		ethernet0 = "/soc/dp1";
 		ethernet1 = "/soc/dp2";
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_red;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
 	};
 
 	chosen {
@@ -182,26 +178,13 @@
 			pinctrl-0 = <&gpio_leds_default>;
 			pinctrl-names = "default";
 
-		led_power_blue: led@26 {
-                        label = "status:blue";
-                        gpios = <&tlmm 45 GPIO_ACTIVE_HIGH>;
-			max-brightness = <160>;
-			linux,default-trigger = "none";
-                	};
-
-                led_power_green:led@30 {
-                        label = "status:green";
-                        gpios = <&tlmm 26 GPIO_ACTIVE_HIGH>;
-			max-brightness = <160>;
-			linux,default-trigger = "none";
-                };
-
-                led_power_red:led@45 {
-                        label = "status:red";
-                        gpios = <&tlmm 30 GPIO_ACTIVE_HIGH>;
-			max-brightness = <160>;
-			linux,default-trigger = "none";
-                };
+			led-0 {
+				color = <LED_COLOR_ID_GREEN>;
+				function = LED_FUNCTION_WLAN;
+				gpios = <&tlmm 36 GPIO_ACTIVE_HIGH>;
+				linux,default-trigger = "phy0tx";
+				default-state = "off";
+			};
 		};
 
 		gpio_keys {
@@ -211,9 +194,9 @@
 			status = "okay";
 
 			button@1 {
-				label = "rst";
-				linux,code = <KEY_RESTART>;
-				gpios = <&tlmm 17 GPIO_ACTIVE_LOW>;
+				label = "wps";
+				linux,code = <KEY_WPS_BUTTON>;
+				gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;
 				linux,input-type = <1>;
 				debounce-interval = <60>;
 			};
@@ -479,7 +462,7 @@
 	};
 
 	button_pins: button-state {
-		pins = "gpio17";
+		pins = "gpio35";
 		function = "gpio";
 		drive-strength = <8>;
 		bias-pull-up;
@@ -498,24 +481,6 @@
 		bias-pull-up;
 		output-low;
 	};
-
-	led_pins: led_pins {
-                mux_1 {
-                        pins = "gpio26";
-                        function = "gpio";
-                        drive-strength = <8>;
-                };
-                mux_2 {
-                        pins = "gpio30";
-                        function = "gpio";
-                        drive-strength = <8>;
-                };
-                mux_3 {
-                        pins = "gpio45";
-                        function = "gpio";
-                        drive-strength = <8>;
-                };
-        };
 };
 
 &license_manager {

feeds/qca-wifi-7/ipq53xx/dts/ipq5332-cig-wf189h.dts

@@ -1,777 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
-/*
- * IPQ5332 RDP446 board device tree source
- *
- * Copyright (c) 2020-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-/dts-v1/;
-
-#include "ipq5332.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-#include "ipq5332-default-memory.dtsi"
-
-/ {
-	model = "CIG WF189H";
-	compatible = "cig,wf189h", "qcom,ipq5332-ap-mi04.1", "qcom,ipq5332-rdp446", "qcom,ipq5332";
-
-	/*     1G  Layout for IPQ5332 + QCN6432 + QCN6432
-	 * +==========+==============+========================+
-	 * |         |              |                         |
-	 * |  Region | Start Offset |          Size           |
-	 * |         |              |                         |
-	 * +---------+--------------+-------------------------+
-	 * |   Q6    |              |                         |
-	 * |  code/  |  0x4A900000  |          25MB           |
-	 * |  data   |              |                         |
-	 * +---------+--------------+-------------------------+
-	 * | IPQ5332 |              |                         |
-	 * |  data   |  0x4C200000  |          21MB           |
-	 * +---------+--------------+-------------------------+
-	 * | IPQ5332 |              |                         |
-	 * | M3 Dump |  0x4D700000  |           1MB           |
-	 * +---------+--------------+-------------------------+
-	 * | IPQ5332 |              |                         |
-	 * |  QDSS   |  0x4D800000  |           1MB           |
-	 * +---------+--------------+-------------------------+
-	 * | IPQ5332 |              |                         |
-	 * |  CALDB  |  0x4D900000  |           5MB           |
-	 * +---------+--------------+-------------------------+
-	 * |QCN6432_1|              |                         |
-	 * |  data   |  0x4DE00000  |          21MB           |
-	 * +---------+--------------+-------------------------+
-	 * |QCN6432_1|              |                         |
-	 * | M3 Dump |  0x4F300000  |           1MB           |
-	 * +---------+--------------+-------------------------+
-	 * |QCN6432_1|              |                         |
-	 * |  QDSS   |  0x4E400000  |           1MB           |
-	 * +---------+--------------+-------------------------+
-	 * |QCN6432_1|              |                         |
-	 * |  CALDB  |  0x4F500000  |           5MB           |
-	 * +---------+--------------+-------------------------+
-	 * |QCN6432_2|              |                         |
-	 * |  data   |  0x4FA00000  |          21MB           |
-	 * +---------+--------------+-------------------------+
-	 * |QCN6432_2|              |                         |
-	 * | M3 Dump |  0x50F00000  |           1MB           |
-	 * +---------+--------------+-------------------------+
-	 * |QCN6432_2|              |                         |
-	 * |  QDSS   |  0x51000000  |           1MB           |
-	 * +---------+--------------+-------------------------+
-	 * |QCN6432_2|              |                         |
-	 * |  CALDB  |  0x51100000  |           5MB           |
-	 * +---------+--------------+-------------------------+
-	 * |         |              |                         |
-	 * |   MLO   |  0x51600000  |          12MB           |
-	 * +==================================================+
-	 * |                                                  |
-	 * |                                                  |
-	 * |                                                  |
-	 * |             Rest of memory for Linux             |
-	 * |                                                  |
-	 * |                                                  |
-	 * |                                                  |
-	 * +==================================================+
-	 */
-
-	reserved-memory {
-
-		/delete-node/ m3_dump@4cc00000;
-		/delete-node/ q6_etr_dump@1;
-		/delete-node/ mlo_global_mem_0@0x4db00000;
-		/delete-node/ wcnss@4a900000;
-		/delete-node/ q6_caldb_region@4ce00000;
-
-		q6_mem_regions: q6_mem_regions@4A900000  {
-			reg = <0x0 0x4a900000 0x0 0x6D00000>;
-			no-map;
-		};
-
-		q6_code_data: q6_code_data@4A900000 {
-			reg = <0x0 0x4a900000 0x0 0x1900000>;
-			no-map;
-		};
-
-		q6_ipq5332_data: q6_ipq5332_data@4C200000 {
-			reg = <0x0 0x4C200000 0x0 0x1500000>;
-			no-map;
-		};
-
-		m3_dump: m3_dump@4D700000 {
-			reg = <0x0 0x4D700000 0x0 0x100000>;
-			no-map;
-		};
-
-		q6_etr_region: q6_etr_dump@4D800000 {
-			reg = <0x0 0x4D800000 0x0 0x100000>;
-			no-map;
-		};
-
-		q6_ipq5332_caldb: q6_ipq5332_caldb@4D900000 {
-			reg = <0x0 0x4D900000 0x0 0x500000>;
-			no-map;
-		};
-
-		q6_qcn6432_data_1: q6_qcn6432_data_1@4DE00000 {
-			reg = <0x0 0x4DE00000 0x0 0x1500000>;
-			no-map;
-		};
-
-		m3_dump_qcn6432_1: m3_dump_qcn6432_1@4F300000 {
-			reg = <0x0 0x4F300000 0x0 0x100000>;
-			no-map;
-                };
-
-		q6_qcn6432_etr_1: q6_qcn6432_etr_1@4F400000 {
-			reg = <0x0 0x4F400000 0x0 0x100000>;
-			no-map;
-		};
-
-		q6_qcn6432_caldb_1: q6_qcn6432_caldb_1@4F500000 {
-			reg = <0x0 0x4F500000 0x0 0x500000>;
-			no-map;
-		};
-
-		q6_qcn6432_data_2: q6_qcn6432_data_2@4FA00000 {
-			reg = <0x0 0x4FA00000 0x0 0x1500000>;
-			no-map;
-		};
-
-		m3_dump_qcn6432_2: m3_dump_qcn6432_2@50F00000 {
-			reg = <0x0 0x50F00000 0x0 0x100000>;
-			no-map;
-                };
-
-		q6_qcn6432_etr_2: q6_qcn6432_etr_2@51000000 {
-			reg = <0x0 0x51000000 0x0 0x100000>;
-			no-map;
-		};
-
-		q6_qcn6432_caldb_2: q6_qcn6432_caldb_2@51100000 {
-			reg = <0x0 0x51100000 0x0 0x500000>;
-			no-map;
-		};
-
-		mlo_global_mem0: mlo_global_mem_0@51600000 {
-			reg = <0x0 0x51600000 0x0 0xC00000>;
-			no-map;
-		};
-	};
-
-	aliases {
-		serial0 = &blsp1_uart0;
-		serial1 = &blsp1_uart1;
-		ethernet0 = "/soc/dp1";
-		ethernet1 = "/soc/dp2";
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_red;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		stdout-path = "serial0";
-	};
-
-	soc@0 {
-		mdio:mdio@90000 {
-			pinctrl-0 = <&mdio1_pins &mdio0_pins>;
-			pinctrl-names = "default";
-			/*gpio51 for manhattan reset*/
-      phy-reset-gpio = <&tlmm 22 GPIO_ACTIVE_LOW>;
-			phyaddr_fixup = <0xC90F018>;
-			uniphyaddr_fixup = <0xC90F014>;
-			mdio_clk_fixup; /* MDIO clock sequence fix up flag */
-			status = "okay";
-
-			phy0: ethernet-phy@0 {
-				reg = <1>;
-				fixup;
-			};
-			phy1: ethernet-phy@1 {
-				reg = <2>;
-				fixup;
-			};
-			phy2: ethernet-phy@2 {
-				reg = <3>;
-				fixup;
-			};
-			phy3: ethernet-phy@3 {
-				reg = <4>;
-				fixup;
-			};
-
-			switch0@10 {
-				compatible = "qca,qca8386";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0x10>;
-
-				ports {
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					port@0 {
-						reg = <0>;
-						label = "cpu";
-						ethernet = <&gmac2>;
-						dsa-tag-protocol = "qca_4b";
-					};
-
-					port@1 {
-						reg = <1>;
-						label = "lan1";
-						phy-handle = <&phy0>;
-						phy-mode = "usxgmii";
-					};
-
-					port@2 {
-						reg = <2>;
-						label = "lan2";
-						phy-handle = <&phy1>;
-						phy-mode = "usxgmii";
-					};
-
-					port@3 {
-						reg = <3>;
-						label = "lan3";
-						phy-handle = <&phy2>;
-						phy-mode = "usxgmii";
-					};
-
-					port@4 {
-						reg = <4>;
-						label = "lan4";
-						phy-handle = <&phy3>;
-						phy-mode = "usxgmii";
-					};
-
-					port@5 {
-						reg = <5>;
-						forced-speed = <2500>;
-						forced-duplex = <1>;
-					}; 
-				};
-			};
-		};
-
-		pwmleds {
-			compatible = "pwm-leds";
-
-			led_power_red: red {
-				label = "pwm:red";
-				pwms = <&pwm 3 1250000>;
-				max-brightness = <160>;
-				linux,default-trigger = "none";
-			};
-
-			led_power_green: green {
-				label = "pwm:green";
-				pwms = <&pwm 2 1250000>;
-				max-brightness = <160>;
-				linux,default-trigger = "none";
-			};
-
-			led_power_blue: blue {
-				label = "pwm:blue";
-				pwms = <&pwm 1 1250000>;
-				max-brightness = <160>;
-				linux,default-trigger = "none";
-			};
-		};
-
-		gpio_keys {
-			compatible = "gpio-keys";
-			pinctrl-0 = <&button_pins>;
-			pinctrl-names = "default";
-			status = "okay";
-
-			button@1 {
-				label = "rst";
-				linux,code = <KEY_RESTART>;
-				gpios = <&tlmm 21 GPIO_ACTIVE_LOW>;
-				linux,input-type = <1>;
-				debounce-interval = <60>;
-			};
-		};
-
-		ess-instance {
-			num_devices = <0x2>;
-
-			ess-switch@3a000000 {
-				pinctrl-names = "default";
-				switch_cpu_bmp = <0x1>;  /* cpu port bitmap */
-				switch_lan_bmp = <0x2>; /* lan port bitmap */
-				switch_wan_bmp = <0x4>; /* wan port bitmap */
-				switch_mac_mode = <0xc>; /* mac mode for uniphy instance0*/
-				switch_mac_mode1 = <0xf>; /* mac mode for uniphy instance1*/
-				switch_mac_mode2 = <0xff>; /* mac mode for uniphy instance2*/
-
-				qcom,port_phyinfo {
-					port@0 {
-						port_id = <1>;
-						forced-speed = <2500>;
-						forced-duplex = <1>;
-					};
-					port@1 {
-						port_id = <2>;
-						phy_address = <4>;
-					};
-				};
-			};
-
-			ess-switch1@1 {
-				compatible = "qcom,ess-switch-qca8386";
-				device_id = <1>;
-				switch_access_mode = "mdio";
-				mdio-bus = <&mdio>;
-				switch_mac_mode = <0xc>; /* mac mode for uniphy instance0 */
-				switch_mac_mode1 = <0xc>; /* mac mode1 for uniphy instance1 */
-				switch_cpu_bmp = <0x1>;  /* cpu port bitmap */
-				switch_lan_bmp = <0x0e>; /* lan port bitmap */
-				switch_wan_bmp = <0x0>;  /* wan port bitmap */
-//				link-polling-required = <0>;
-				fdb_sync = "interrupt";
-				link-intr-gpio = <&tlmm 24 GPIO_ACTIVE_HIGH>;
-
-				qcom,port_phyinfo {
-					port@0 {
-						port_id = <0>;
-						forced-speed = <2500>;
-						forced-duplex = <1>;
-					};
-					port@1 {
-						port_id = <1>;
-						phy_address = <1>;
-					};
-					port@2 {
-						port_id = <2>;
-						phy_address = <2>;
-					};
-					port@3 {
-						port_id = <3>;
-						phy_address = <3>;
-					};
-				};
-
-				led_source@2 {
-					source = <2>;
-					mode = "normal";
-					speed = "all";
-					blink_en = "enable";
-					active = "high";
-				};
-				led_source@5 {
-					source = <5>;
-					mode = "normal";
-					speed = "all";
-					blink_en = "enable";
-					active = "high";
-				};
-				led_source@8 {
-					source = <8>;
-					mode = "normal";
-					speed = "all";
-					blink_en = "enable";
-					active = "high";
-				};
-				led_source@11 {
-					source = <11>;
-					mode = "normal";
-					speed = "all";
-					blink_en = "enable";
-					active = "high";
-				};
-			};
-		};
-
-		dp1 {
-			device_type = "network";
-			compatible = "qcom,nss-dp";
-			qcom,id = <2>;
-			reg = <0x3a504000 0x4000>;
-			qcom,mactype = <1>;
-			local-mac-address = [000000000000];
-			qcom,mht-dev = <1>;
-			qcom,is_switch_connected = <1>;
-			qcom,ppe-offload-disabled = <1>;
-			phy-mode = "sgmii";
-		};
-
-		gmac2:dp2 {
-			device_type = "network";
-			compatible = "qcom,nss-dp";
-			qcom,id = <1>;
-			reg = <0x3a500000 0x4000>;
-			qcom,mactype = <1>;
-			local-mac-address = [000000000000];
-			phy-mode = "sgmii";
-			qcom,mht-dev = <1>;
-			qcom,is_switch_connected = <1>;
-			qcom,ppe-offload-disabled = <1>;
-		};
-
-		/* EDMA host driver configuration for the board */
-		edma@3ab00000 {
-			qcom,txdesc-ring-start = <4>;		/* Tx desc ring start ID */
-			qcom,txdesc-rings = <12>;		/* Total number of Tx desc rings to be provisioned */
-			qcom,mht-txdesc-rings = <8>;            /* Extra Tx desc rings to be provisioned for MHT SW ports */
-			qcom,txcmpl-ring-start = <4>;		/* Tx complete ring start ID */
-			qcom,txcmpl-rings = <12>;		/* Total number of Tx complete rings to be provisioned */
-			qcom,mht-txcmpl-rings = <8>;            /* Extra Tx complete rings to be provisioned for mht sw ports. */
-			qcom,rxfill-ring-start = <4>;		/* Rx fill ring start ID */
-			qcom,rxfill-rings = <4>;		/* Total number of Rx fill rings to be provisioned */
-			qcom,rxdesc-ring-start = <12>;		/* Rx desc ring start ID */
-			qcom,rxdesc-rings = <4>;		/* Total number of Rx desc rings to be provisioned */
-			qcom,rx-page-mode = <0>;		/* Rx fill ring page mode */
-			qcom,tx-map-priority-level = <1>;	/* Tx priority level per port */
-			qcom,rx-map-priority-level = <1>;	/* Rx priority level per core */
-			qcom,ppeds-num = <2>;			/* Number of PPEDS nodes */
-			/* PPE-DS node format: <Rx-fill Tx-cmpl Rx Tx Queue-base Queue-count> */
-			qcom,ppeds-map = <1 1 1 1 32 8>,	/* PPEDS Node#0 ring and queue map */
-					<2 2 2 2 40 8>;		/* PPEDS Node#1 ring and queue map */
-			qcom,txdesc-map = <8 9 10 11>,		/* Port0 per-core Tx ring map */
-					<12 13 14 15>,        /* MHT-Port1 per-core Tx ring map */
-					<4 5 6 7>,            /* MHT-Port2 per-core Tx ring map/packets from  vp*/
-					<16 17 18 19>,        /* MHT-Port3 per-core Tx ring map */
-					<20 21 22 23>;        /* MHT-Port4 per-core Tx ring map */
-			qcom,txdesc-fc-grp-map = <1 2 3 4 5>;   /* Per GMAC flow control group map */
-			qcom,rxfill-map = <4 5 6 7>;		/* Per-core Rx fill ring map */
-			qcom,rxdesc-map = <12 13 14 15>;	/* Per-core Rx desc ring map */
-			qcom,rx-queue-start = <0>;		/* Rx queue start */
-			qcom,rx-ring-queue-map = <0 8 16 24>,	/* Priority 0 queues per-core Rx ring map */
-						<1 9 17 25>,	/* Priority 1 queues per-core Rx ring map */
-						<2 10 18 26>,	/* Priority 2 queues per-core Rx ring map */
-						<3 11 19 27>,	/* Priority 3 queues per-core Rx ring map */
-						<4 12 20 28>,	/* Priority 4 queues per-core Rx ring map */
-						<5 13 21 29>,	/* Priority 5 queues per-core Rx ring map */
-						<6 14 22 30>,	/* Priority 6 queues per-core Rx ring map */
-						<7 15 23 31>;	/* Priority 7 queues per-core Rx ring map */
-			interrupts = <0 163 4>,			/* Tx complete ring id #4 IRQ info */
-				   <0 164 4>,			/* Tx complete ring id #5 IRQ info */
-				   <0 165 4>,			/* Tx complete ring id #6 IRQ info */
-				   <0 166 4>,			/* Tx complete ring id #7 IRQ info */
-				   <0 167 4>,			/* Tx complete ring id #8 IRQ info */
-				   <0 168 4>,			/* Tx complete ring id #9 IRQ info */
-				   <0 169 4>,			/* Tx complete ring id #10 IRQ info */
-				   <0 170 4>,			/* Tx complete ring id #11 IRQ info */
-				   <0 171 4>,			/* Tx complete ring id #12 IRQ info */
-				   <0 172 4>,			/* Tx complete ring id #13 IRQ info */
-				   <0 173 4>,			/* Tx complete ring id #14 IRQ info */
-				   <0 174 4>,			/* Tx complete ring id #15 IRQ info */
-				   <0 139 4>,			/* Rx desc ring id #12 IRQ info */
-				   <0 140 4>,			/* Rx desc ring id #13 IRQ info */
-				   <0 141 4>,			/* Rx desc ring id #14 IRQ info */
-				   <0 142 4>,			/* Rx desc ring id #15 IRQ info */
-				   <0 191 4>,			/* Misc error IRQ info */
-				<0 160 4>,			/* PPEDS Node #1(TxComp ring id #1) TxComplete IRQ info */
-				<0 128 4>,			/* PPEDS Node #1(Rx Desc ring id #1) Rx Desc IRQ info */
-				<0 152 4>,			/* PPEDS Node #1(RxFill Desc ring id #1) Rx Fill IRQ info */
-				<0 161 4>,			/* PPEDS Node #2(TxComp ring id #2) TxComplete IRQ info */
-				<0 129 4>,			/* PPEDS Node #2(Rx Desc ring id #2) Rx Desc IRQ info */
-				<0 153 4>,                      /* PPEDS Node #2(RxFill Desc ring id #2) Rx Fill IRQ info */
-				<0 175 4>,                   /* MHT port Tx complete ring id #16 IRQ info */
-				<0 176 4>,                   /* MHT port Tx complete ring id #17 IRQ info */
-				<0 177 4>,                   /* MHT port Tx complete ring id #18 IRQ info */
-				<0 178 4>,                   /* MHT port Tx complete ring id #19 IRQ info */
-				<0 179 4>,                   /* MHT port Tx complete ring id #20 IRQ info */
-				<0 180 4>,                   /* MHT port Tx complete ring id #21 IRQ info */
-				<0 181 4>,                   /* MHT port Tx complete ring id #22 IRQ info */
-				<0 182 4>;                   /* MHT port Tx complete ring id #23 IRQ info */
-		};
-
-		wsi: wsi {
-			id = <0>;
-			num_chip = <3>;
-			status = "okay";
-			chip_info = <0 2 1 2>,
-				    <1 2 2 0>,
-				    <2 2 0 1>;
-		};
-
-		q6v5_wcss: remoteproc@d100000 {
-			boot-args = <0x1 0x4 0x3 0x1 0x2f 0x2>,
-					<0x1 0x4 0x4 0x2 0x2c 0x2>;
-			memory-region = <&q6_mem_regions>,
-					<&mlo_global_mem0>;
-
-			/delete-node/ remoteproc_pd1;
-			/delete-node/ remoteproc_pd2;
-			/delete-node/ remoteproc_pd3;
-
-			q6_wcss_pd4: remoteproc_pd4 {
-				compatible = "qcom,ipq5332-mpd-upd-text";
-				firmware = "IPQ5332/q6_fw4.mdt";
-
-				q6_wcss_pd1: remoteproc_pd1 {
-					compatible = "qcom,ipq5332-wcss-ahb-mpd";
-					firmware = "IPQ5332/q6_fw1.mdt";
-					m3_firmware = "IPQ5332/iu_fw.mdt";
-					interrupts-extended = <&wcss_smp2p_in 8 0>,
-							<&wcss_smp2p_in 9 0>,
-							<&wcss_smp2p_in 12 0>,
-							<&wcss_smp2p_in 11 0>;
-					interrupt-names = "fatal",
-							"ready",
-							"spawn-ack",
-							"stop-ack";
-
-					qcom,smem-states = <&wcss_smp2p_out 8>,
-							<&wcss_smp2p_out 9>,
-							<&wcss_smp2p_out 10>;
-					qcom,smem-state-names = "shutdown",
-								"stop",
-								"spawn";
-				};
-
-				q6_wcss_pd2: remoteproc_pd2 {
-					compatible = "qcom,ipq5332-wcss-pcie-mpd";
-					firmware = "IPQ5332/q6_fw2.mdt";
-					m3_firmware = "qcn6432/iu_fw.mdt";
-					interrupts-extended = <&wcss_smp2p_in 16 0>,
-							<&wcss_smp2p_in 17 0>,
-							<&wcss_smp2p_in 20 0>,
-							<&wcss_smp2p_in 19 0>;
-					interrupt-names = "fatal",
-							"ready",
-							"spawn-ack",
-							"stop-ack";
-
-					qcom,smem-states = <&wcss_smp2p_out 16>,
-							<&wcss_smp2p_out 17>,
-							<&wcss_smp2p_out 18>;
-					qcom,smem-state-names = "shutdown",
-								"stop",
-								"spawn";
-					status = "ok";
-				};
-
-				q6_wcss_pd3: remoteproc_pd3 {
-					compatible = "qcom,ipq5332-wcss-pcie-mpd";
-					firmware = "IPQ5332/q6_fw3.mdt";
-					interrupts-extended = <&wcss_smp2p_in 24 0>,
-							<&wcss_smp2p_in 25 0>,
-							<&wcss_smp2p_in 28 0>,
-							<&wcss_smp2p_in 27 0>;
-					interrupt-names = "fatal",
-							"ready",
-							"spawn-ack",
-							"stop-ack";
-
-					qcom,smem-states = <&wcss_smp2p_out 24>,
-							<&wcss_smp2p_out 25>,
-							<&wcss_smp2p_out 26>;
-					qcom,smem-state-names = "shutdown",
-								"stop",
-								"spawn";
-					status = "ok";
-				};
-			};
-		};
-	};
-};
-
-&blsp1_uart0 {
-	pinctrl-0 = <&serial_0_pins>;
-	pinctrl-names = "default";
-	status = "okay";
-};
-
-&blsp1_uart1 {
-	pinctrl-0 = <&serial_1_pins>;
-	pinctrl-names = "default";
-	status = "okay";
-};
-
-&sleep_clk {
-	clock-frequency = <32000>;
-};
-
-&xo {
-	clock-frequency = <24000000>;
-};
-
-&qpic_bam {
-	status = "okay";
-};
-
-&qpic_nand {
-	pinctrl-0 = <&qspi_default_state>;
-	pinctrl-names = "default";
-	status = "okay";
-
-	nandcs@0 {
-		reg = <0>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		nand-ecc-strength = <8>;
-		nand-ecc-step-size = <512>;
-		nand-bus-width = <8>;
-	};
-};
-
-&tlmm {
-	qspi_default_state: qspi-default-state {
-		qspi_clock {
-			pins = "gpio13";
-			function = "qspi_clk";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-
-		qspi_cs {
-			pins = "gpio12";
-			function = "qspi_cs";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-
-		qspi_data {
-			pins = "gpio8", "gpio9", "gpio10", "gpio11";
-			function = "qspi_data";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-	};
-
-	pwm_pins: pwm_pinmux {
-		/* PWM LED GREEN */
-		mux_1 {
-			pins = "gpio30";
-			function = "pwm1";
-			drive-strength = <8>;
-		};
-		/* PWM LED BLUE */
-		mux_2 {
-			pins = "gpio31";
-			function = "pwm1";
-			drive-strength = <8>;
-		};
-		/* PWM LED RED */
-		mux_3 {
-			pins = "gpio29";
-			function = "pwm1";
-			drive-strength = <8>;
-		};
-	};
-
-	serial_1_pins: serial1-pinmux {
-		pins = "gpio33", "gpio34", "gpio35", "gpio36";
-		function = "blsp1_uart2";
-		drive-strength = <8>;
-		bias-pull-up;
-	};
-
-
-	button_pins: button-state {
-		pins = "gpio21";
-		function = "gpio";
-		drive-strength = <8>;
-		bias-pull-up;
-	};
-
-	spi_0_data_clk_pins: spi-0-data-clk-state {
-		pins = "gpio14", "gpio15", "gpio16";
-		function = "blsp0_spi";
-		drive-strength = <2>;
-		bias-pull-down;
-	};
-
-	spi_0_cs_pins: spi-0-cs-state {
-		pins = "gpio17";
-		function = "blsp0_spi";
-		drive-strength = <2>;
-		bias-pull-up;
-	};
-
-	mdio1_pins: mdio1-state {
-		mux_0 {
-			pins = "gpio27";
-			function = "mdc1";
-			drive-strength = <2>;
-			bias-pull-up;
-		};
-		mux_1 {
-			pins = "gpio28";
-			function = "mdio1";
-			drive-strength = <2>;
-			bias-pull-up;
-		};
-	};
-};
-
-&license_manager {
-	status = "okay";
-};
-
-&pwm {
-        pinctrl-0 = <&pwm_pins>;
-        used-pwm-indices = <1>, <1>, <0>, <1>;
-        pinctrl-names = "default";
-        status = "okay";
-};
-
-&hs_m31phy_0 {
-	status = "okay";
-};
-
-&wifi0 {
-	qcom,multipd_arch;
-	qcom,rproc = <&q6_wcss_pd1>;
-	qcom,rproc_rpd = <&q6v5_wcss>;
-	qcom,userpd-subsys-name = "q6v5_wcss_userpd1";
-	qcom,tgt-mem-mode = <0>;
-	qcom,bdf-addr = <0x4C200000 0x4C200000 0x4C200000 0x0 0x0 0x0>;
-	qcom,caldb-addr = <0x4D900000 0x4D900000 0x4D900000 0x0 0x0 0x0>;
-	qcom,caldb-size = <0x500000>;
-	qcom,board_id = <0x41>;
-	mem-region = <&q6_ipq5332_data>;
-	memory-region = <&q6_ipq5332_data>;
-	qcom,wsi = <&wsi>;
-	qcom,wsi_index = <0>;
-	status = "okay";
-};
-
-&wifi1 {
-	qcom,multipd_arch;
-	qcom,rproc = <&q6_wcss_pd2>;
-	qcom,rproc_rpd = <&q6v5_wcss>;
-	qcom,userpd-subsys-name = "q6v5_wcss_userpd2";
-	qcom,tgt-mem-mode = <0>;
-	qcom,bdf-addr = <0x4DE00000 0x4DE00000 0x4DE00000 0x0 0x0 0x0>;
-	qcom,caldb-addr = <0x4F500000 0x4F500000 0x4F500000 0x0 0x0 0x0>;
-	qcom,umac-irq-reset-addr = <0x20000884>;
-	qcom,caldb-size = <0x500000>;
-	qcom,board_id = <0x061>;
-	mem-region = <&q6_qcn6432_data_1>;
-	memory-region = <&q6_qcn6432_data_1>;
-	qcom,wsi = <&wsi>;
-	qcom,wsi_index = <1>;
-	status = "okay";
-	interrupts = <GIC_SPI 33 IRQ_TYPE_EDGE_RISING>;
-	interrupt-names = "umac_reset";
-};
-
-&wifi2 {
-	qcom,multipd_arch;
-	qcom,rproc = <&q6_wcss_pd3>;
-	qcom,rproc_rpd = <&q6v5_wcss>;
-	qcom,userpd-subsys-name = "q6v5_wcss_userpd3";
-	qcom,tgt-mem-mode = <0>;
-	qcom,bdf-addr = <0x4FA00000 0x4FA00000 0x4FA00000 0x0 0x0 0x0>;
-	qcom,caldb-addr = <0x51100000 0x51100000 0x51100000 0x0 0x0 0x0>;
-	qcom,umac-irq-reset-addr = <0x18000884>;
-	qcom,caldb-size = <0x500000>;
-	qcom,board_id = <0x0b1>;
-	mem-region = <&q6_qcn6432_data_2>;
-	memory-region = <&q6_qcn6432_data_2>;
-	qcom,wsi = <&wsi>;
-	qcom,wsi_index = <2>;
-	status = "okay";
-	interrupts = <GIC_SPI 410 IRQ_TYPE_EDGE_RISING>;
-	interrupt-names = "umac_reset";
-};

feeds/qca-wifi-7/ipq53xx/dts/ipq5332-cig-wf189w.dts

@@ -166,10 +166,10 @@
 		serial1 = &blsp1_uart1;
 		ethernet0 = "/soc/dp1";
 		ethernet1 = "/soc/dp2";
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_red;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	chosen {
@@ -261,21 +261,21 @@
 		pwmleds {
 			compatible = "pwm-leds";
 
-			led_power_red: red {
+			red {
 				label = "pwm:red";
 				pwms = <&pwm 3 1250000>;
 				max-brightness = <160>;
 				linux,default-trigger = "none";
 			};
 
-			led_power_green: green {
+			green {
 				label = "pwm:green";
 				pwms = <&pwm 2 1250000>;
 				max-brightness = <160>;
 				linux,default-trigger = "none";
 			};
 
-			led_power_blue: blue {
+			led_power: blue {
 				label = "pwm:blue";
 				pwms = <&pwm 1 1250000>;
 				max-brightness = <160>;
@@ -307,7 +307,7 @@
 				switch_lan_bmp = <0x2>; /* lan port bitmap */
 				switch_wan_bmp = <0x4>; /* wan port bitmap */
 				switch_mac_mode = <0xc>; /* mac mode for uniphy instance0*/
-				switch_mac_mode1 = <0xf>; /* mac mode for uniphy instance1*/
+				switch_mac_mode1 = <0xc>; /* mac mode for uniphy instance1*/
 				switch_mac_mode2 = <0xff>; /* mac mode for uniphy instance2*/
 
 				qcom,port_phyinfo {
@@ -318,7 +318,8 @@
 					};
 					port@1 {
 						port_id = <2>;
-						phy_address = <4>;
+						forced-speed = <2500>;
+						forced-duplex = <1>;
 					};
 				};
 			};
@@ -330,9 +331,9 @@
 				mdio-bus = <&mdio>;
 				switch_mac_mode = <0xc>; /* mac mode for uniphy instance0 */
 				switch_mac_mode1 = <0xc>; /* mac mode1 for uniphy instance1 */
-				switch_cpu_bmp = <0x1>;  /* cpu port bitmap */
+				switch_cpu_bmp = <0x21>;  /* cpu port bitmap */
 				switch_lan_bmp = <0x0e>; /* lan port bitmap */
-				switch_wan_bmp = <0x0>;  /* wan port bitmap */
+				switch_wan_bmp = <0x10>;  /* wan port bitmap */
 //				link-polling-required = <0>;
 				fdb_sync = "interrupt";
 				link-intr-gpio = <&tlmm 24 GPIO_ACTIVE_HIGH>;
@@ -355,6 +356,15 @@
 						port_id = <3>;
 						phy_address = <3>;
 					};
+					port@4 {
+						port_id = <4>;
+						phy_address = <4>;
+					};
+					port@5 {
+						port_id = <5>;
+						forced-speed = <2500>;
+						forced-duplex = <1>; 
+					};
 				};
 
 				led_source@2 {

feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sonicfi-rap750w-311a.dts

@@ -242,10 +242,6 @@
 		serial1 = &blsp1_uart1;
 		ethernet0 = "/soc/dp1";
 		ethernet1 = "/soc/dp2";
-		led-boot = &led_power;
-		led-failsafe = &led_power;
-		led-running = &led_power;
-		led-upgrade = &led_power;
 	};
 
 	chosen {
@@ -328,6 +324,19 @@
 			};
 		};
 
+		leds {
+			compatible = "gpio-leds";
+			pinctrl-0 = <&gpio_leds_default>;
+			pinctrl-names = "default";
+
+			led-0 {
+				color = <LED_COLOR_ID_GREEN>;
+				function = LED_FUNCTION_WLAN;
+				gpios = <&tlmm 36 GPIO_ACTIVE_HIGH>;
+				linux,default-trigger = "phy0tx";
+				default-state = "off";
+			};
+		};
 
 		gpio_keys {
 			compatible = "gpio-keys";
@@ -336,39 +345,14 @@
 			status = "okay";
 
 			button@1 {
-				label = "reset";
-				linux,code = <KEY_RESTART>;
-				gpios = <&tlmm 24 GPIO_ACTIVE_LOW>;
+				label = "wps";
+				linux,code = <KEY_WPS_BUTTON>;
+				gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;
 				linux,input-type = <1>;
 				debounce-interval = <60>;
 			};
 		};
 
-		pwmleds {
-			compatible = "pwm-leds";
-
-			red {
-				label = "pwm:red";
-				pwms = <&pwm 2 1250000>;
-				max-brightness = <1>;
-				linux,default-trigger = "none";
-			};
-		
-			green {
-				label = "pwm:green";
-				pwms = <&pwm 3 1250000>;
-				max-brightness = <1>;
-				linux,default-trigger = "none";
-			};
-		
-			led_power: blue {
-				label = "pwm:blue";
-				pwms = <&pwm 1 1250000>;
-				max-brightness = <1>;
-				linux,default-trigger = "none";
-			};
-		};
-
 		ess-instance {
 			num_devices = <0x2>;
 
@@ -427,6 +411,34 @@
 					};
 				};
 
+				led_source@2 {
+					source = <2>;
+					mode = "normal";
+					speed = "all";
+					blink_en = "enable";
+					active = "high";
+				};
+				led_source@5 {
+					source = <5>;
+					mode = "normal";
+					speed = "all";
+					blink_en = "enable";
+					active = "high";
+				};
+				led_source@8 {
+					source = <8>;
+					mode = "normal";
+					speed = "all";
+					blink_en = "enable";
+					active = "high";
+				};
+				led_source@11 {
+					source = <11>;
+					mode = "normal";
+					speed = "all";
+					blink_en = "enable";
+					active = "high";
+				};
 			};
 		};
 
@@ -537,7 +549,7 @@
 			memory-region = <&q6_mem_regions>;
 
 			q6_wcss_pd1: remoteproc_pd1 {
-				status = "okay";
+				status = "ok";
 			};
 
 			q6_wcss_pd2: remoteproc_pd2 {
@@ -558,7 +570,7 @@
 				qcom,smem-state-names = "shutdown",
 							"stop",
 							"spawn";
-				status = "okay";
+				status = "ok";
 			};
 		};
 	};
@@ -569,13 +581,13 @@
 	pinctrl-names = "default";
 	status = "okay";
 };
-/*
+
 &blsp1_uart1 {
         pinctrl-0 = <&serial_1_pins>;
         pinctrl-names = "default";
         status = "disabled";
 };
-*/
+
 &blsp1_i2c1 {
 	clock-frequency  = <400000>;
 	pinctrl-0 = <&i2c_1_pins>;
@@ -652,50 +664,29 @@
 		};
 	};
 
-	pwm_pins: pwm_pinmux {
-			/* PWM LED GREEN */
-			mux_1 {
-				pins = "gpio43";
-				function = "pwm0";
-				drive-strength = <8>;
-			};
-			/* PWM LED BLUE */
-			mux_2 {
-				pins = "gpio45";
-				function = "pwm0";
-				drive-strength = <8>;
-			};
-			/* PWM LED RED */
-			mux_3 {
-				pins = "gpio44";
-				function = "pwm0";
-				drive-strength = <8>;
-			};
-	};
-/*
 	serial_1_pins: serial1-pinmux {
 		pins = "gpio33", "gpio34", "gpio35", "gpio36";
 		function = "blsp1_uart2";
 		drive-strength = <8>;
 		bias-pull-up;
 	};
-*/
+
 	i2c_1_pins: i2c-1-state {
 		pins = "gpio29", "gpio30";
 		function = "blsp1_i2c0";
 		drive-strength = <8>;
 		bias-pull-up;
 	};
-/*
+
 	gpio_leds_default: gpio-leds-default-state {
 		pins = "gpio36";
 		function = "gpio";
 		drive-strength = <8>;
 		bias-pull-down;
-	}; 
-*/
+	};
+
 	button_pins: button-state {
-		pins = "gpio24";
+		pins = "gpio35";
 		function = "gpio";
 		drive-strength = <8>;
 		bias-pull-up;
@@ -734,13 +725,6 @@
 	status = "disabled";
 };
 
-&pwm {
-	pinctrl-0 = <&pwm_pins>;
-	used-pwm-indices = <0>, <1>, <1>, <1>;
-	pinctrl-names = "default";
-	status = "okay";
-};
-
 &hs_m31phy_0 {
 	status = "okay";
 };
@@ -763,7 +747,7 @@
 	memory-region = <&q6_ipq5332_data>;
 	qcom,wsi = <&wsi>;
 	qcom,wsi_index = <0>;
-	status = "okay";
+	status = "ok";
 };
 
 &wifi1 {
@@ -784,7 +768,7 @@
 	memory-region = <&q6_qcn6432_data_1>;
 	qcom,wsi = <&wsi>;
 	qcom,wsi_index = <1>;
-	status = "okay";
+	status = "ok";
 	interrupts = <GIC_SPI 33 IRQ_TYPE_EDGE_RISING>;
 	interrupt-names = "umac_reset";
 };

feeds/qca-wifi-7/ipq53xx/image/ipq53xx.mk

@@ -61,7 +61,7 @@ define Device/sonicfi_rap750w_311a
   IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
   IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand
   IMAGE/nand-factory.ubi := append-ubi
-  DEVICE_PACKAGES := ath12k-wifi-sonicfi-rap750w-311a ath12k-firmware-ipq5332-peb -ath12k-firmware-qcn92xx
+  DEVICE_PACKAGES := ath12k-wifi-sonicfi-rap750w-311a ath12k-firmware-ipq5332-peb
 endef
 TARGET_DEVICES += sonicfi_rap750w_311a
 
@@ -77,17 +77,3 @@ define Device/cig_wf189w
   DEVICE_PACKAGES := ath12k-wifi-cig-wf189w ath12k-firmware-ipq5332-peb-peb
 endef
 TARGET_DEVICES += cig_wf189w
-
-
-define Device/cig_wf189h
-  DEVICE_TITLE := CIG WF189H
-  DEVICE_DTS := ipq5332-cig-wf189h
-  DEVICE_DTS_DIR := ../dts
-  DEVICE_DTS_CONFIG := config@mi04.1
-  IMAGES := sysupgrade.tar nand-factory.bin nand-factory.ubi
-  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
-  IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand
-  IMAGE/nand-factory.ubi := append-ubi
-  DEVICE_PACKAGES := ath12k-wifi-cig-wf189h ath12k-firmware-ipq5332-peb-peb
-endef
-TARGET_DEVICES += cig_wf189h

feeds/tip/certificates/files/usr/bin/mount_certs

@@ -79,8 +79,6 @@ hfcl,ion4xe)
 	;;
 cig,wf186w|\
 cig,wf189|\
-cig,wf189w|\
-cig,wf189h|\
 cig,wf186h|\
 yuncore,ax840|\
 yuncore,fap655)

feeds/ucentral/rrmd/files/usr/share/rrmd/policy_chanutil.uc

@@ -290,7 +290,6 @@ function fixed_channel_config(iface, iface_num, fixed_channel_f, auto_channel_f,
 function get_chan_util(radio_band, sleep_time) {
 	let pdev_stats = {};
 	let chan_util = 0;
-    let total_usage = 0;
 
     let prev_values = {
 		txFrameCount: null,
@@ -349,8 +348,7 @@ function get_chan_util(radio_band, sleep_time) {
             if (ignore != 1) {
                 let cycle_count_delta = curr_values.cycleCount - prev_values.cycleCount;
                 let rx_clear_delta = curr_values.rxClearCount - prev_values.rxClearCount;
-                if (cycle_count_delta && cycle_count_delta > 0)
-                    total_usage = (rx_clear_delta * 100) / cycle_count_delta;
+                let total_usage = (rx_clear_delta * 100) / cycle_count_delta;
                 chan_util = total_usage;
             }
 

feeds/ucentral/ucentral-schema/Makefile

@@ -4,10 +4,10 @@ PKG_NAME:=ucentral-schema
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-schema.git
-PKG_MIRROR_HASH:=cd070141672c85e72001e2e36616aa7159c6dc8ca4bbacca1b61a41c145cde2f
+PKG_MIRROR_HASH:=fe33f072d7bcbbb14c7c3415e0750699bb5dae8a9af06c59c90c020f8b192a15
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2025-01-27
-PKG_SOURCE_VERSION:=048a53d4a6cf3ef570dab9e2d10989844ae7c355
+PKG_SOURCE_VERSION:=5a6d23b76bc51289ae99d22fdf406516b0c630e6
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=BSD-3-Clause
 

feeds/ucentral/ucentral-tools/Makefile

@@ -3,12 +3,6 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=ucentral-tools
 PKG_RELEASE:=1
 
-PKG_SOURCE_URL=https://github.com/blogic/ucentral-tools.git
-PKG_MIRROR_HASH:=9ae6a0cd431595871c233550427c4043c2ba7ddb3c5d87e46ab74a03b2b5a947
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2021-01-28
-PKG_SOURCE_VERSION:=b013fc636e48d407870a46aaa68a09ed74de8d6f
-
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=BSD-3-Clause
 

feeds/ucentral/ucentral-tools/src/CMakeLists.txt

@@ -0,0 +1,36 @@
+cmake_minimum_required(VERSION 2.6)
+
+PROJECT(openwifi-tools C)
+INCLUDE(GNUInstallDirs)
+ADD_DEFINITIONS(-Os -ggdb -Wall -Werror --std=gnu99 -Wmissing-declarations)
+
+SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
+
+ADD_EXECUTABLE(firstcontact firstcontact.c)
+TARGET_LINK_LIBRARIES(firstcontact curl crypto ssl ubox)
+INSTALL(TARGETS firstcontact
+	RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
+)
+
+ADD_EXECUTABLE(dhcpdiscover dhcpdiscover.c)
+INSTALL(TARGETS dhcpdiscover
+	RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
+)
+
+ADD_EXECUTABLE(dnsprobe dnsprobe.c)
+TARGET_LINK_LIBRARIES(dnsprobe ubox resolv)
+INSTALL(TARGETS dnsprobe
+	RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
+)
+
+ADD_EXECUTABLE(radiusprobe radiusprobe.c)
+TARGET_LINK_LIBRARIES(radiusprobe radcli)
+INSTALL(TARGETS radiusprobe
+	RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
+)
+
+ADD_EXECUTABLE(ip-collide ip-collide.c)
+TARGET_LINK_LIBRARIES(ip-collide ubox)
+INSTALL(TARGETS ip-collide
+	RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
+)

feeds/ucentral/ucentral-tools/src/dnsprobe.c

@@ -0,0 +1,690 @@
+/*
+ * nslookup_lede - musl compatible replacement for busybox nslookup
+ *
+ * Copyright (C) 2017 Jo-Philipp Wich <jo@mein.io>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+//config:config NSLOOKUP_OPENWRT
+//config:	bool "nslookup_openwrt"
+//config:	depends on !NSLOOKUP
+//config:	default y
+//config:	help
+//config:	  nslookup is a tool to query Internet name servers (LEDE flavor).
+//config:
+//config:config FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
+//config:       bool "Enable long options"
+//config:       default y
+//config:       depends on NSLOOKUP_OPENWRT && LONG_OPTS
+//config:       help
+//config:         Support long options for the nslookup applet.
+
+//applet:IF_NSLOOKUP_OPENWRT(APPLET(nslookup, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_NSLOOKUP_OPENWRT) += nslookup_lede.o
+
+//usage:#define nslookup_lede_trivial_usage
+//usage:       "[HOST] [SERVER]"
+//usage:#define nslookup_lede_full_usage "\n\n"
+//usage:       "Query the nameserver for the IP address of the given HOST\n"
+//usage:       "optionally using a specified DNS server"
+//usage:
+//usage:#define nslookup_lede_example_usage
+//usage:       "$ nslookup localhost\n"
+//usage:       "Server:     default\n"
+//usage:       "Address:    default\n"
+//usage:       "\n"
+//usage:       "Name:       debian\n"
+//usage:       "Address:    127.0.0.1\n"
+
+#include <stdio.h>
+#include <resolv.h>
+#include <string.h>
+#include <errno.h>
+#include <time.h>
+#include <poll.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <net/if.h>
+#include <netdb.h>
+
+#include <libubox/ulog.h>
+
+#define ENABLE_FEATURE_IPV6	1
+
+typedef struct len_and_sockaddr {
+	socklen_t len;
+	union {
+		struct sockaddr sa;
+		struct sockaddr_in sin;
+#if ENABLE_FEATURE_IPV6
+		struct sockaddr_in6 sin6;
+#endif
+	} u;
+} len_and_sockaddr;
+
+struct ns {
+	const char *name;
+	len_and_sockaddr addr;
+	int failures;
+	int replies;
+};
+
+struct query {
+	const char *name;
+	size_t qlen, rlen;
+	unsigned char query[512], reply[512];
+	unsigned long latency;
+	int rcode, n_ns;
+};
+
+static const char *rcodes[] = {
+	"NOERROR",
+	"FORMERR",
+	"SERVFAIL",
+	"NXDOMAIN",
+	"NOTIMP",
+	"REFUSED",
+	"YXDOMAIN",
+	"YXRRSET",
+	"NXRRSET",
+	"NOTAUTH",
+	"NOTZONE",
+	"RESERVED11",
+	"RESERVED12",
+	"RESERVED13",
+	"RESERVED14",
+	"RESERVED15",
+	"BADVERS"
+};
+
+static unsigned int default_port = 53;
+static unsigned int default_retry = 1;
+static unsigned int default_timeout = 2;
+
+
+static int parse_reply(const unsigned char *msg, size_t len, int *bb_style_counter)
+{
+	ns_msg handle;
+	ns_rr rr;
+	int i, n, rdlen;
+	const char *format = NULL;
+	char astr[INET6_ADDRSTRLEN], dname[MAXDNAME];
+	const unsigned char *cp;
+
+	if (ns_initparse(msg, len, &handle) != 0) {
+		//fprintf(stderr, "Unable to parse reply: %s\n", strerror(errno));
+		return -1;
+	}
+
+	for (i = 0; i < ns_msg_count(handle, ns_s_an); i++) {
+		if (ns_parserr(&handle, ns_s_an, i, &rr) != 0) {
+			//fprintf(stderr, "Unable to parse resource record: %s\n", strerror(errno));
+			return -1;
+		}
+
+		rdlen = ns_rr_rdlen(rr);
+
+		switch (ns_rr_type(rr))
+		{
+		case ns_t_a:
+			if (rdlen != 4) {
+				//fprintf(stderr, "Unexpected A record length\n");
+				return -1;
+			}
+			inet_ntop(AF_INET, ns_rr_rdata(rr), astr, sizeof(astr));
+			printf("Name:\t%s\nAddress: %s\n", ns_rr_name(rr), astr);
+			break;
+
+#if ENABLE_FEATURE_IPV6
+		case ns_t_aaaa:
+			if (rdlen != 16) {
+				//fprintf(stderr, "Unexpected AAAA record length\n");
+				return -1;
+			}
+			inet_ntop(AF_INET6, ns_rr_rdata(rr), astr, sizeof(astr));
+			printf("%s\thas AAAA address %s\n", ns_rr_name(rr), astr);
+			break;
+#endif
+
+		case ns_t_ns:
+			if (!format)
+				format = "%s\tnameserver = %s\n";
+			/* fall through */
+
+		case ns_t_cname:
+			if (!format)
+				format = "%s\tcanonical name = %s\n";
+			/* fall through */
+
+		case ns_t_ptr:
+			if (!format)
+				format = "%s\tname = %s\n";
+			if (ns_name_uncompress(ns_msg_base(handle), ns_msg_end(handle),
+				ns_rr_rdata(rr), dname, sizeof(dname)) < 0) {
+				//fprintf(stderr, "Unable to uncompress domain: %s\n", strerror(errno));
+				return -1;
+			}
+			printf(format, ns_rr_name(rr), dname);
+			break;
+
+		case ns_t_mx:
+			if (rdlen < 2) {
+				fprintf(stderr, "MX record too short\n");
+				return -1;
+			}
+			n = ns_get16(ns_rr_rdata(rr));
+			if (ns_name_uncompress(ns_msg_base(handle), ns_msg_end(handle),
+				ns_rr_rdata(rr) + 2, dname, sizeof(dname)) < 0) {
+				//fprintf(stderr, "Cannot uncompress MX domain: %s\n", strerror(errno));
+				return -1;
+			}
+			printf("%s\tmail exchanger = %d %s\n", ns_rr_name(rr), n, dname);
+			break;
+
+		case ns_t_txt:
+			if (rdlen < 1) {
+				//fprintf(stderr, "TXT record too short\n");
+				return -1;
+			}
+			n = *(unsigned char *)ns_rr_rdata(rr);
+			if (n > 0) {
+				memset(dname, 0, sizeof(dname));
+				memcpy(dname, ns_rr_rdata(rr) + 1, n);
+				printf("%s\ttext = \"%s\"\n", ns_rr_name(rr), dname);
+			}
+			break;
+
+		case ns_t_soa:
+			if (rdlen < 20) {
+				//fprintf(stderr, "SOA record too short\n");
+				return -1;
+			}
+
+			printf("%s\n", ns_rr_name(rr));
+
+			cp = ns_rr_rdata(rr);
+			n = ns_name_uncompress(ns_msg_base(handle), ns_msg_end(handle),
+			                       cp, dname, sizeof(dname));
+
+			if (n < 0) {
+				//fprintf(stderr, "Unable to uncompress domain: %s\n", strerror(errno));
+				return -1;
+			}
+
+			printf("\torigin = %s\n", dname);
+			cp += n;
+
+			n = ns_name_uncompress(ns_msg_base(handle), ns_msg_end(handle),
+			                       cp, dname, sizeof(dname));
+
+			if (n < 0) {
+				//fprintf(stderr, "Unable to uncompress domain: %s\n", strerror(errno));
+				return -1;
+			}
+
+			printf("\tmail addr = %s\n", dname);
+			cp += n;
+
+			printf("\tserial = %lu\n", ns_get32(cp));
+			cp += 4;
+
+			printf("\trefresh = %lu\n", ns_get32(cp));
+			cp += 4;
+
+			printf("\tretry = %lu\n", ns_get32(cp));
+			cp += 4;
+
+			printf("\texpire = %lu\n", ns_get32(cp));
+			cp += 4;
+
+			printf("\tminimum = %lu\n", ns_get32(cp));
+			break;
+
+		default:
+			break;
+		}
+	}
+
+	return i;
+}
+
+static int parse_nsaddr(const char *addrstr, len_and_sockaddr *lsa)
+{
+	char *eptr, *hash, ifname[IFNAMSIZ];
+	unsigned int port = default_port;
+	unsigned int scope = 0;
+
+	hash = strchr(addrstr, '#');
+
+	if (hash) {
+		*hash++ = '\0';
+		port = strtoul(hash, &eptr, 10);
+
+		if (eptr == hash || *eptr != '\0' || port > 65535) {
+			errno = EINVAL;
+			return -1;
+		}
+	}
+
+	hash = strchr(addrstr, '%');
+
+	if (hash) {
+		for (eptr = ++hash; *eptr != '\0' && *eptr != '#'; eptr++) {
+			if ((eptr - hash) >= IFNAMSIZ) {
+				errno = ENODEV;
+				return -1;
+			}
+
+			ifname[eptr - hash] = *eptr;
+		}
+
+		ifname[eptr - hash] = '\0';
+		scope = if_nametoindex(ifname);
+
+		if (scope == 0) {
+			errno = ENODEV;
+			return -1;
+		}
+	}
+
+#if ENABLE_FEATURE_IPV6
+	if (inet_pton(AF_INET6, addrstr, &lsa->u.sin6.sin6_addr)) {
+		lsa->u.sin6.sin6_family = AF_INET6;
+		lsa->u.sin6.sin6_port = htons(port);
+		lsa->u.sin6.sin6_scope_id = scope;
+		lsa->len = sizeof(lsa->u.sin6);
+		return 0;
+	}
+#endif
+
+	if (!scope && inet_pton(AF_INET, addrstr, &lsa->u.sin.sin_addr)) {
+		lsa->u.sin.sin_family = AF_INET;
+		lsa->u.sin.sin_port = htons(port);
+		lsa->len = sizeof(lsa->u.sin);
+		return 0;
+	}
+
+	errno = EINVAL;
+	return -1;
+}
+
+static unsigned long mtime(void)
+{
+	struct timespec ts;
+	clock_gettime(CLOCK_REALTIME, &ts);
+	return (unsigned long)ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
+}
+
+#if ENABLE_FEATURE_IPV6
+static void to_v4_mapped(len_and_sockaddr *a)
+{
+	if (a->u.sa.sa_family != AF_INET)
+		return;
+
+	memcpy(a->u.sin6.sin6_addr.s6_addr + 12,
+	       &a->u.sin.sin_addr, 4);
+
+	memcpy(a->u.sin6.sin6_addr.s6_addr,
+	       "\0\0\0\0\0\0\0\0\0\0\xff\xff", 12);
+
+	a->u.sin6.sin6_family = AF_INET6;
+	a->u.sin6.sin6_flowinfo = 0;
+	a->u.sin6.sin6_scope_id = 0;
+	a->len = sizeof(a->u.sin6);
+}
+#endif
+
+
+/*
+ * Function logic borrowed & modified from musl libc, res_msend.c
+ */
+
+static int send_queries(struct ns *ns, int n_ns, struct query *queries, int n_queries)
+{
+	int fd;
+	int timeout = default_timeout * 1000, retry_interval, servfail_retry = 0;
+	len_and_sockaddr from = { };
+#if ENABLE_FEATURE_IPV6
+	int one = 1;
+#endif
+	int recvlen = 0;
+	int n_replies = 0;
+	struct pollfd pfd;
+	unsigned long t0, t1, t2;
+	int nn, qn, next_query = 0;
+
+	from.u.sa.sa_family = AF_INET;
+	from.len = sizeof(from.u.sin);
+
+#if ENABLE_FEATURE_IPV6
+	for (nn = 0; nn < n_ns; nn++) {
+		if (ns[nn].addr.u.sa.sa_family == AF_INET6) {
+			from.u.sa.sa_family = AF_INET6;
+			from.len = sizeof(from.u.sin6);
+			break;
+		}
+	}
+#endif
+
+	/* Get local address and open/bind a socket */
+	fd = socket(from.u.sa.sa_family, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
+
+#if ENABLE_FEATURE_IPV6
+	/* Handle case where system lacks IPv6 support */
+	if (fd < 0 && from.u.sa.sa_family == AF_INET6 && errno == EAFNOSUPPORT) {
+		fd = socket(AF_INET, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
+		from.u.sa.sa_family = AF_INET;
+	}
+#endif
+
+	if (fd < 0)
+		return -1;
+
+	if (bind(fd, &from.u.sa, from.len) < 0) {
+		close(fd);
+		return -1;
+	}
+
+#if ENABLE_FEATURE_IPV6
+	/* Convert any IPv4 addresses in a mixed environment to v4-mapped */
+	if (from.u.sa.sa_family == AF_INET6) {
+		setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(one));
+
+		for (nn = 0; nn < n_ns; nn++)
+			to_v4_mapped(&ns[nn].addr);
+	}
+#endif
+
+	pfd.fd = fd;
+	pfd.events = POLLIN;
+	retry_interval = timeout / default_retry;
+	t0 = t2 = mtime();
+	t1 = t2 - retry_interval;
+
+	for (; t2 - t0 < timeout; t2 = mtime()) {
+		if (t2 - t1 >= retry_interval) {
+			for (qn = 0; qn < n_queries; qn++) {
+				if (queries[qn].rlen)
+					continue;
+
+				for (nn = 0; nn < n_ns; nn++) {
+					sendto(fd, queries[qn].query, queries[qn].qlen,
+					       MSG_NOSIGNAL, &ns[nn].addr.u.sa, ns[nn].addr.len);
+				}
+			}
+
+			t1 = t2;
+			servfail_retry = 2 * n_queries;
+		}
+
+		/* Wait for a response, or until time to retry */
+		if (poll(&pfd, 1, t1+retry_interval-t2) <= 0)
+			continue;
+
+		while (1) {
+			recvlen = recvfrom(fd, queries[next_query].reply,
+			                   sizeof(queries[next_query].reply), 0,
+			                   &from.u.sa, &from.len);
+
+			/* read error */
+			if (recvlen < 0)
+				break;
+
+			/* Ignore non-identifiable packets */
+			if (recvlen < 4)
+				continue;
+
+			/* Ignore replies from addresses we didn't send to */
+			for (nn = 0; nn < n_ns; nn++)
+				if (memcmp(&from.u.sa, &ns[nn].addr.u.sa, from.len) == 0)
+					break;
+
+			if (nn >= n_ns)
+				continue;
+
+			/* Find which query this answer goes with, if any */
+			for (qn = next_query; qn < n_queries; qn++)
+				if (!memcmp(queries[next_query].reply, queries[qn].query, 2))
+					break;
+
+			if (qn >= n_queries || queries[qn].rlen)
+				continue;
+
+			queries[qn].rcode = queries[next_query].reply[3] & 15;
+			queries[qn].latency = mtime() - t0;
+			queries[qn].n_ns = nn;
+
+			ns[nn].replies++;
+
+			/* Only accept positive or negative responses;
+			 * retry immediately on server failure, and ignore
+			 * all other codes such as refusal. */
+			switch (queries[qn].rcode) {
+			case 0:
+			case 3:
+				break;
+
+			case 2:
+				if (servfail_retry && servfail_retry--) {
+					ns[nn].failures++;
+					sendto(fd, queries[qn].query, queries[qn].qlen,
+					       MSG_NOSIGNAL, &ns[nn].addr.u.sa, ns[nn].addr.len);
+				}
+				/* fall through */
+
+			default:
+				continue;
+			}
+
+			/* Store answer */
+			n_replies++;
+
+			queries[qn].rlen = recvlen;
+
+			if (qn == next_query) {
+				while (next_query < n_queries) {
+					if (!queries[next_query].rlen)
+						break;
+
+					next_query++;
+				}
+			}
+			else {
+				memcpy(queries[qn].reply, queries[next_query].reply, recvlen);
+			}
+
+			if (next_query >= n_queries)
+				return n_replies;
+		}
+	}
+
+	return n_replies;
+}
+
+static struct ns *add_ns(struct ns **ns, int *n_ns, const char *addr)
+{
+	char portstr[sizeof("65535")], *p;
+	len_and_sockaddr a = { };
+	struct ns *tmp;
+	struct addrinfo *ai, *aip, hints = {
+		.ai_flags = AI_NUMERICSERV,
+		.ai_socktype = SOCK_DGRAM
+	};
+
+	if (parse_nsaddr(addr, &a)) {
+		/* Maybe we got a domain name, attempt to resolve it using the standard
+		 * resolver routines */
+
+		p = strchr(addr, '#');
+		snprintf(portstr, sizeof(portstr), "%hu",
+		         (unsigned short)(p ? strtoul(p, NULL, 10) : default_port));
+
+		if (!getaddrinfo(addr, portstr, &hints, &ai)) {
+			for (aip = ai; aip; aip = aip->ai_next) {
+				if (aip->ai_addr->sa_family != AF_INET &&
+				    aip->ai_addr->sa_family != AF_INET6)
+					continue;
+
+#if ! ENABLE_FEATURE_IPV6
+				if (aip->ai_addr->sa_family != AF_INET)
+					continue;
+#endif
+
+				tmp = realloc(*ns, sizeof(**ns) * (*n_ns + 1));
+
+				if (!tmp)
+					return NULL;
+
+				*ns = tmp;
+
+				(*ns)[*n_ns].name = addr;
+				(*ns)[*n_ns].replies = 0;
+				(*ns)[*n_ns].failures = 0;
+				(*ns)[*n_ns].addr.len = aip->ai_addrlen;
+
+				memcpy(&(*ns)[*n_ns].addr.u.sa, aip->ai_addr, aip->ai_addrlen);
+
+				(*n_ns)++;
+			}
+
+			freeaddrinfo(ai);
+
+			return &(*ns)[*n_ns];
+		}
+
+		return NULL;
+	}
+
+	tmp = realloc(*ns, sizeof(**ns) * (*n_ns + 1));
+
+	if (!tmp)
+		return NULL;
+
+	*ns = tmp;
+
+	(*ns)[*n_ns].addr = a;
+	(*ns)[*n_ns].name = addr;
+	(*ns)[*n_ns].replies = 0;
+	(*ns)[*n_ns].failures = 0;
+
+	return &(*ns)[(*n_ns)++];
+}
+
+static struct query *add_query(struct query **queries, int *n_queries,
+                               int type, const char *dname)
+{
+	struct query *tmp;
+	ssize_t qlen;
+
+	tmp = realloc(*queries, sizeof(**queries) * (*n_queries + 1));
+
+	if (!tmp)
+		return NULL;
+
+	memset(&tmp[*n_queries], 0, sizeof(*tmp));
+
+	qlen = res_mkquery(QUERY, dname, C_IN, type, NULL, 0, NULL,
+	                   tmp[*n_queries].query, sizeof(tmp[*n_queries].query));
+
+	tmp[*n_queries].qlen = qlen;
+	tmp[*n_queries].name = dname;
+	*queries = tmp;
+
+	return &tmp[(*n_queries)++];
+}
+
+int main(int argc, char **argv)
+{
+	int rc = 1;
+	struct ns *ns = NULL;
+	struct query *queries = NULL;
+	int n_ns = 0, n_queries = 0;
+	int c = 0;
+
+	char *url = "telecominfraproject.com";
+	char *server = "127.0.0.1";
+	int v6 = 0;
+
+	while (1) {
+		int option = getopt(argc, argv, "u:s:i:6");
+
+		if (option == -1)
+			break;
+
+		switch (option) {
+		case '6':
+			v6 = 1;
+			break;
+		case 'u':
+			url = optarg;
+			break;
+		case 's':
+			server = optarg;
+			break;
+		default:
+		case 'h':
+			printf("Usage: dnsprobe OPTIONS\n"
+			       "  -6 - use ipv6\n"
+			       "  -u <url>\n"
+			       "  -s <server>\n");
+			return -1;
+		}
+	}
+
+	ulog_open(ULOG_SYSLOG | ULOG_STDIO, LOG_DAEMON, "dnsprobe");
+
+	ULOG_INFO("attempting to probe dns - %s %s %s\n",
+		url, server, v6 ? "ipv6" : "");
+
+
+	add_query(&queries, &n_queries, v6 ? T_AAAA : T_A, url);
+
+	add_ns(&ns, &n_ns, server);
+
+	rc = send_queries(&ns[0], 1, queries, n_queries);
+	if (rc <= 0) {
+		fprintf(stderr, "Failed to send queries: %s\n", strerror(errno));
+		rc = -1;
+		goto out;
+	}
+
+	if (queries[0].rcode != 0) {
+		printf("** server can't find %s: %s\n", queries[0].name,
+		rcodes[queries[0].rcode]);
+		goto out;
+	}
+
+	if (queries[0].rlen) {
+		c = parse_reply(queries[0].reply, queries[0].rlen, NULL);
+	}
+
+	if (c == 0)
+		printf("*** Can't find %s: No answer\n", queries[0].name);
+	else if (c < 0)
+		printf("*** Can't find %s: Parse error\n", queries[0].name);
+	else
+		rc = 0;
+
+out:
+	if (n_ns)
+		free(ns);
+
+	if (n_queries)
+		free(queries);
+
+	return rc;
+}

feeds/ucentral/ucentral-tools/src/firstcontact.c

@@ -0,0 +1,100 @@
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <getopt.h>
+
+#include <curl/curl.h>
+
+#include <libubox/ulog.h>
+
+static const char *file_cert = "/etc/open-wifi/client.pem";
+static const char *file_key  = "/etc/open-wifi/client_dec.key";
+static const char *file_json = "/etc/open-wifi/redirector.json";
+static const char *file_dbg  = "/tmp/firstcontact.hdr";
+
+int main(int argc, char **argv)
+{
+	FILE *fp_json;
+	FILE *fp_dbg;
+	CURLcode res;
+	CURL *curl;
+	char *devid = NULL;
+	char *url;
+
+	while (1) {
+		int option = getopt(argc, argv, "k:c:o:hi:");
+
+		if (option == -1)
+			break;
+
+		switch (option) {
+		case 'k':
+			file_key = optarg;
+			break;
+		case 'c':
+			file_cert = optarg;
+			break;
+		case 'o':
+			file_json = optarg;
+			break;
+		case 'i':
+			devid = optarg;
+			break;
+		default:
+		case 'h':
+			printf("Usage: firstcontact OPTIONS\n"
+			       "  -k <keyfile>\n"
+			       "  -c <certfile>\n"
+			       "  -o <outfile>\n"
+			       "  -i <devid>\n");
+			return -1;
+		}
+	}
+
+	if (!devid) {
+		fprintf(stderr, "missing devid\n");
+		return -1;
+	}
+
+	ulog_open(ULOG_SYSLOG | ULOG_STDIO, LOG_DAEMON, "firstcontact");
+	ULOG_INFO("attempting first contact\n");
+
+	fp_dbg = fopen(file_dbg, "wb");
+	fp_json = fopen(file_json, "wb");
+	if (!fp_json) {
+		ULOG_ERR("failed to create %s\n", file_json);
+		return -1;
+	}
+
+	curl_global_init(CURL_GLOBAL_DEFAULT);
+	curl = curl_easy_init();
+	if (!curl) {
+		ULOG_ERR("curl_easy_init failed\n");
+		return -1;
+	}
+
+	if (asprintf(&url, "https://clientauth.demo.one.digicert.com/iot/api/v2/device/%s", devid) < 0) {
+		ULOG_ERR("failed to assemble url\n");
+		return -1;
+	}
+
+	curl_easy_setopt(curl, CURLOPT_URL, url);
+	curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp_json);
+	curl_easy_setopt(curl, CURLOPT_HEADERDATA, fp_dbg);
+	curl_easy_setopt(curl, CURLOPT_SSLCERTTYPE, "PEM");
+	curl_easy_setopt(curl, CURLOPT_SSLCERT, file_cert);
+	curl_easy_setopt(curl, CURLOPT_SSLKEYTYPE, "PEM");
+	curl_easy_setopt(curl, CURLOPT_SSLKEY, file_key);
+	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1L);
+
+	res = curl_easy_perform(curl);
+	if (res != CURLE_OK)
+		ULOG_ERR("curl_easy_perform() failed: %s\n", curl_easy_strerror(res));
+	else
+		ULOG_INFO("downloaded first contact data\n");
+	curl_easy_cleanup(curl);
+	curl_global_cleanup();
+
+	ulog_close();
+
+	return (res != CURLE_OK);
+}

feeds/ucentral/ucentral-tools/src/ip-collide.c

@@ -0,0 +1,86 @@
+#include <arpa/inet.h>
+#include <net/if.h>
+
+#include <libubox/list.h>
+#include <libubox/ulog.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+struct route {
+	struct list_head list;
+	char devname[64];
+	uint32_t domain;
+	uint32_t mask;
+};
+
+static struct list_head routes = LIST_HEAD_INIT(routes);
+
+static int parse_routes(void)
+{
+	FILE *fp = fopen("/proc/net/route", "r");
+	int flgs, ref, use, metric, mtu, win, ir;
+	struct route *route;
+	unsigned long g;
+	int r;
+
+	r = fscanf(fp, "%*[^\n]\n");
+	if (r < 0) {
+		fprintf(stderr, "failed to parse routes\n");
+		return -1;
+	}
+	while (1) {
+		route = malloc(sizeof(*route));
+		if (!route)
+			break;
+		memset(route, 0, sizeof(*route));
+		r = fscanf(fp, "%63s%x%lx%X%d%d%d%x%d%d%d\n",
+			route->devname, &route->domain, &g, &flgs, &ref, &use, &metric, &route->mask,
+			&mtu, &win, &ir);
+		if (r != 11 && (r < 0) && feof(fp))
+			break;
+		list_add(&route->list, &routes);
+		printf("1 %s %x %x\n", route->devname, ntohl(route->domain), ntohl(route->mask));
+	}
+
+	fclose(fp);
+
+	return 0;
+}
+
+static int find_collisions(void)
+{
+	struct route *route;
+
+	list_for_each_entry(route, &routes, list) {
+		struct route *compare;
+
+		if (!route->domain || !route->mask)
+			continue;
+		list_for_each_entry(compare, &routes, list) {
+			if (!compare->domain || !compare->mask)
+				continue;
+			if (compare == route)
+				continue;
+			if (((route->domain & route->mask) == (compare->domain & route->mask)) ||
+			    ((route->domain & compare->mask) == (compare->domain & compare->mask))) {
+				ULOG_ERR("collision detected\n");
+				return 1;
+			}
+		}
+	}
+	ULOG_INFO("no collision detected\n");
+	return 0;
+}
+
+int main(int argc, char **argv)
+{
+	ulog_open(ULOG_SYSLOG | ULOG_STDIO, LOG_DAEMON, "ip-collide");
+
+	parse_routes();
+	if (!list_empty(&routes))
+		return find_collisions();
+
+	return 0;
+}

feeds/ucentral/ucentral-tools/src/radiusprobe.c

@@ -0,0 +1,47 @@
+#include <stdio.h>
+#include <string.h>
+#include <radcli/radcli.h>
+
+int
+main(int argc, char **argv)
+{
+	int result;
+	char username[128];
+	char passwd[AUTH_PASS_LEN + 1];
+	VALUE_PAIR *send, *received;
+	uint32_t service;
+	rc_handle *rh;
+
+	/* Not needed if you already used openlog() */
+	rc_openlog("radiusprobe");
+
+	if ((rh = rc_read_config("/tmp/radius.conf")) == NULL)
+		return ERROR_RC;
+
+	strcpy(username, "healthcheck");
+	strcpy(passwd, "uCentral");
+
+	send = NULL;
+
+	if (rc_avpair_add(rh, &send, PW_USER_NAME, username, -1, 0) == NULL)
+		return ERROR_RC;
+
+	if (rc_avpair_add(rh, &send, PW_USER_PASSWORD, passwd, -1, 0) == NULL)
+		return ERROR_RC;
+
+	service = PW_AUTHENTICATE_ONLY;
+	if (rc_avpair_add(rh, &send, PW_SERVICE_TYPE, &service, -1, 0) == NULL)
+		return ERROR_RC;
+
+	result = rc_auth(rh, 0, send, &received, NULL);
+
+	if (result == OK_RC || result == REJECT_RC) {
+		fprintf(stderr, "RADIUS server OK\n");
+		result = 0;
+	} else {
+		fprintf(stderr, "RADIUS server failure\n");
+		result = -1;
+	}
+
+	return result;
+}

profiles/cig_wf189.yml

@@ -12,4 +12,3 @@ include:
 packages:
   - ipq53xx
   - ftm
-  - qca-ssdk-shell

profiles/cig_wf189h.yml

@@ -1,14 +0,0 @@
----
-profile: cig_wf189h
-target: ipq53xx
-subtarget: generic
-description: Build image for the CIG WF189h
-image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-cig_wf189h-squashfs-sysupgrade.tar
-feeds:
-  - name: qca
-    path: ../../feeds/qca-wifi-7
-include:
-  - ucentral-ap
-packages:
-  - ipq53xx
-  - qca-ssdk-shell

profiles/ucentral-ap.yml

@@ -45,7 +45,6 @@ packages:
   - ucentral-schema
   - ucentral-state
   - ucentral-tools
-  - udhcpinject
   - udhcprelay
   - ufp
   - ugps