diff --git a/feeds/ipq807x/ipq807x/base-files/etc/board.d/02_network b/feeds/ipq807x/ipq807x/base-files/etc/board.d/02_network
index ad5f0f46b..c667adccb 100755
--- a/feeds/ipq807x/ipq807x/base-files/etc/board.d/02_network
+++ b/feeds/ipq807x/ipq807x/base-files/etc/board.d/02_network
@@ -127,17 +127,10 @@ qcom_setup_interfaces()
 		;;
 	cybertan,eww631-a1)
 		ucidef_set_interface_wan "eth0"
-		ucidef_add_switch "switch1"
-		ucidef_add_switch_attr "switch1" "enable" "false"
-		ucidef_add_switch_attr "switch1" "reset" "true"
+		ucidef_set_interface_lan ""
 		;;
 	cybertan,eww631-b1)
-		ucidef_add_switch "switch0"
-		ucidef_set_interface_wan "eth0"
-		ucidef_set_interface_lan ""
-		ucidef_add_switch "switch1"
-		ucidef_add_switch_attr "switch1" "enable" "false"
-		ucidef_add_switch_attr "switch1" "reset" "true"
+		ucidef_add_switch "switch1" "5:wan" "2:lan" "3:lan" "4:lan" "6@eth0"
 		;;
 	wallys,dr5018)
                 ucidef_set_interface_lan "eth0 eth1"
@@ -195,10 +188,14 @@ qcom_setup_macs()
                 ;;
 	cybertan,eww631-a1|\
 	cybertan,eww631-b1)
-		mac=$(grep -i -m 1 BaseMacAddress= /dev/`cat /proc/mtd | grep APPSBLENV | cut -d: -f1` | cut -d= -f2)
-		[ -z "$mac"] && mac="00:11:22:33:44:00"
+		mtd=$(find_mtd_chardev "0:APPSBLENV")
+		[ -z "$mtd" ] && return;
+		mac=$(grep BaseMacAddress= $mtd | cut -d '=' -f2)
+		[ -z "$mac" ] && return;
 		wan_mac=$(macaddr_canonicalize $mac)
+		lan_mac=$(macaddr_add "$wan_mac" 1)
 		ucidef_set_network_device_mac eth0 $wan_mac
+		ip link set eth0 address $wan_mac
 		ucidef_set_label_macaddr $wan_mac
 		;;
 	cig,wf188n|\
@@ -227,7 +224,7 @@ qcom_setup_macs()
 		;;
 	cybertan,eww622-a1)
 		mac=$(grep -i -m 1 mac_addr_base= /dev/`cat /proc/mtd | grep devinfo | cut -d: -f1` | cut -d= -f2)
-		[ -z "$mac"] && mac="00:11:22:33:44:55"
+		[ -z "$mac" ] && mac="00:11:22:33:44:55"
 		wan_mac=$(macaddr_canonicalize $mac)
 		lan_mac=$(macaddr_add "$wan_mac" 1)
 		ucidef_set_network_device_mac eth0 $wan_mac
diff --git a/feeds/ipq807x/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata b/feeds/ipq807x/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
index 24186dba7..9c8fbc736 100755
--- a/feeds/ipq807x/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
+++ b/feeds/ipq807x/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
@@ -99,6 +99,27 @@ ath11k_generate_macs_wf186h() {
         echo -ne \\x${mac3//:/\\x} >> /lib/firmware/ath11k-macs
 }
 
+ath11k_generate_macs_eww631_a1() {
+	touch /lib/firmware/ath11k-macs
+	local dev=$(find_mtd_chardev "0:APPSBLENV")
+	mac=$(grep BaseMacAddress= $dev | cut -d '=' -f2)
+	eth=$(macaddr_canonicalize $mac)
+	mac1=$(macaddr_add $eth 1)
+	mac2=$(macaddr_add $eth 2)
+	echo -ne \\x${mac1//:/\\x} >> /lib/firmware/ath11k-macs
+	echo -ne \\x${mac2//:/\\x} >> /lib/firmware/ath11k-macs
+}
+
+ath11k_generate_macs_eww631_b1() {
+	touch /lib/firmware/ath11k-macs
+	local dev=$(find_mtd_chardev "0:APPSBLENV")
+	mac=$(grep BaseMacAddress= $dev | cut -d '=' -f2)
+	eth=$(macaddr_canonicalize $mac)
+	mac1=$(macaddr_add $eth 2)
+	mac2=$(macaddr_add $eth 3)
+	echo -ne \\x${mac1//:/\\x} >> /lib/firmware/ath11k-macs
+	echo -ne \\x${mac2//:/\\x} >> /lib/firmware/ath11k-macs
+}
 
 caldata_die() {
 	echo "caldata: " "$*"
@@ -213,12 +234,12 @@ ath11k/qcn6122/hw1.0/caldata_2.bin)
 	case "$board" in
 	motorola,q14|\
 	wallys,dr5018|\
-	cybertan,eww631-a1|\
-	cybertan,eww631-b1|\
 	edgecore,eap104|\
 	liteon,wpx8324)
 		caldata_extract "0:ART" 0x4c000 0x20000
 		;;
+	cybertan,eww631-a1|\
+	cybertan,eww631-b1|\
 	muxi,ap3220l)
 		caldata_extract "0:ART" 0x26800 0x20000
 		;;
@@ -290,6 +311,12 @@ ath11k-macs)
 	cig,wf186h)
 		ath11k_generate_macs_wf186h
 		;;
+	cybertan,eww631-a1)
+		ath11k_generate_macs_eww631_a1
+		;;
+	cybertan,eww631-b1)
+		ath11k_generate_macs_eww631_b1
+		;;
 	esac
 	;;
 *)
diff --git a/feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-eww631-b1.dts b/feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-eww631-b1.dts
old mode 100644
new mode 100755
index d36a19d73..032d0e705
--- a/feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-eww631-b1.dts
+++ b/feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-eww631-b1.dts
@@ -19,104 +19,84 @@
 / {
 	#address-cells = <0x2>;
 	#size-cells = <0x2>;
-	model = "Qualcomm Technologies, Inc. IPQ5018/AP-MP02.1";
-	compatible = "qcom,ipq5018-mp02.1", "qcom,ipq5018";
+	model = "Qualcomm Technologies, Inc. IPQ5018/AP-MP03.5-C1";
+	compatible = "qcom,ipq5018-mp03.5-c1", "qcom,ipq5018";
 	interrupt-parent = <&intc>;
 
-	MP_256;
-	/delete-property/ MP_512;
-
 	aliases {
 		sdhc1 = &sdhc_1; /* SDC1 eMMC slot */
 		serial0 = &blsp1_uart1;
-		//serial1 = &blsp1_uart2;
+		serial1 = &blsp1_uart2;
 		ethernet0 = "/soc/dp1";
 		ethernet1 = "/soc/dp2";
 	};
 
 	chosen {
 		bootargs = "console=ttyMSM0,115200,n8 rw init=/init";
-
+	#ifdef __IPQ_MEM_PROFILE_256_MB__
 		bootargs-append = " swiotlb=1";
+	#else
+		bootargs-append = " swiotlb=1 coherent_pool=2M";
+	#endif
 		stdout-path = "serial0";
 	};
 
-	/*            256 MB Profile
-	 * +=========+==============+========================+
-	 * |        |              |                         |
-	 * | Region | Start Offset |          Size           |
-	 * |        |              |                         |
-	 * +--------+--------------+-------------------------+
-	 * |        |              |                         |
-	 * |        |              |                         |
-	 * |  NSS   |  0x40000000  |          8MB           |
-	 * |        |              |                         |
-	 * |        |              |                         |
-	 * +--------+--------------+-------------------------+
-	 * |        |              |                         |
-	 * |        |              |                         |
-	 * |        |              |                         |
-	 * |        |              |                         |
-	 * | Linux  |  0x40800000  | Depends on total memory |
-	 * |        |              |                         |
-	 * |        |              |                         |
-	 * |        |              |                         |
-	 * +        |              |                         |
-	 * +--------+--------------+-------------------------+
-	 * |        |              |                         |
-	 * | uboot  |  0x4A600000  |           4MB           |
-	 * |        |              |                         |
-	 * +--------+--------------+-------------------------+
-	 * |  SBL   |  0x4AA00000  |           1MB           |
-	 * +--------+--------------+-------------------------+
-	 * |  smem  |  0x4AB00000  |           1MB           |
-	 * +--------+--------------+-------------------------+
-	 * |        |              |                         |
-	 * |   TZ   |  0x4AC00000  |           4MB           |
-	 * |        |              |                         |
-	 * +--------+--------------+-------------------------+
-	 * |        |              |                         |
-	 * |        |              |                         |
-	 * |        |              |                         |
-	 * |   Q6   |  0x4B000000  |          20MB           |
-	 * |  code/ |              |                         |
-	 * |  data  |              |                         |
-	 * +--------+--------------+-------------------------+
-	 * |        |              |                         |
-	 * |IPQ5018 |  0x4C400000  |          13MB           |
-	 * |  data  |              |                         |
-	 * +--------+--------------+-------------------------+
-	 * | M3 Dump|  0x4D100000  |           1MB           |
-	 * +--------+--------------+-------------------------+
-	 * |  QDSS  |  0x4D200000  |           1MB           |
-	 * +--------+--------------+-------------------------+
-	 * |QCN6122 |  0x4D300000  |          15MB           |
-	 * |  data  |              |                         |
-	 * +--------+--------------+-------------------------+
-	 * | M3 Dump|  0x4E200000  |           1MB           |
-	 * +--------+--------------+-------------------------+
-	 * |  QDSS  |  0x4E300000  |           1MB           |
-	 * +--------+--------------+-------------------------+
-	 * |QCN6122 |  0x4E400000  |          15MB           |
-	 * |  data  |              |                         |
-	 * +--------+--------------+-------------------------+
-	 * | M3 Dump|  0x4F300000  |           1MB           |
-	 * +--------+--------------+-------------------------+
-	 * |  QDSS  |  0x4F400000  |           1MB           |
-	 * +--------+--------------+-------------------------+
-	 * |                                                 |
-	 * |      Rest of the memory for Linux               |
-	 * |                                                 |
-	 * +=================================================+
-	 */
 	reserved-memory {
-		/delete-node/ nss@40000000;
-
-		nss@40000000 {
-			no-map;
-			reg = <0x0 0x40000000 0x0 0x0800000>;
-		};
-
+	#ifdef __IPQ_MEM_PROFILE_256_MB__
+	/*                   256 MB Profile
+	 * +==========+==============+=========================+
+	 * |          |              |                         |
+	 * |  Region  | Start Offset |          Size           |
+	 * |          |              |                         |
+	 * +----------+--------------+-------------------------+
+	 * |    NSS   |  0x40000000  |           8MB           |
+	 * +----------+--------------+-------------------------+
+	 * |   Linux  |  0x40800000  | Depends on total memory |
+	 * +----------+--------------+-------------------------+
+	 * |   uboot  |  0x4A600000  |           4MB           |
+	 * +----------+--------------+-------------------------+
+	 * |    SBL   |  0x4AA00000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * |   smem   |  0x4AB00000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * |    TZ    |  0x4AC00000  |           4MB           |
+	 * +----------+--------------+-------------------------+
+	 * |    Q6    |              |                         |
+	 * |   code/  |  0x4B000000  |          20MB           |
+	 * |   data   |              |                         |
+	 * +----------+--------------+-------------------------+
+	 * |  IPQ5018 |              |                         |
+	 * |   data   |  0x4C400000  |          13MB           |
+	 * +----------+--------------+-------------------------+
+	 * |  IPQ5018 |              |                         |
+	 * |  M3 Dump |  0x4D100000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * |  IPQ5018 |              |                         |
+	 * |   QDSS   |  0x4D200000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_1|              |                         |
+	 * |   data   |  0x4D300000  |          15MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_1|              |                         |
+	 * |  M3 Dump |  0x4E200000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_1|              |                         |
+	 * |   QDSS   |  0x4E300000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_2|              |                         |
+	 * |   data   |  0x4E400000  |          15MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_2|              |                         |
+	 * |  M3 Dump |  0x4F300000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_2|              |                         |
+	 * |   QDSS   |  0x4F400000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * |                                                   |
+	 * |            Rest of the memory for Linux           |
+	 * |                                                   |
+	 * +===================================================+
+	 */
 		q6_mem_regions: q6_mem_regions@4B000000 {
 			no-map;
 			reg = <0x0 0x4B000000 0x0 0x4500000>;
@@ -171,20 +151,153 @@
 			no-map;
 			reg = <0x0 0x4F400000 0x0 0x100000>;
 		};
+	#else
+	/*                 512MB/1GB Profiles
+	 * +==========+==============+=========================+
+	 * |          |              |                         |
+	 * |  Region  | Start Offset |          Size           |
+	 * |          |              |                         |
+	 * +----------+--------------+-------------------------+
+	 * |    NSS   |  0x40000000  |          16MB           |
+	 * +----------+--------------+-------------------------+
+	 * |   Linux  |  0x41000000  | Depends on total memory |
+	 * +----------+--------------+-------------------------+
+	 * |   uboot  |  0x4A600000  |           4MB           |
+	 * +----------+--------------+-------------------------+
+	 * |    SBL   |  0x4AA00000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * |   smem   |  0x4AB00000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * |    TZ    |  0x4AC00000  |           4MB           |
+	 * +----------+--------------+-------------------------+
+	 * |    Q6    |              |                         |
+	 * |   code/  |  0x4B000000  |          20MB           |
+	 * |   data   |              |                         |
+	 * +----------+--------------+-------------------------+
+	 * |  IPQ5018 |              |                         |
+	 * |   data   |  0x4C400000  |          14MB           |
+	 * +----------+--------------+-------------------------+
+	 * |  IPQ5018 |              |                         |
+	 * |  M3 Dump |  0x4D200000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * |  IPQ5018 |              |                         |
+	 * |   QDSS   |  0x4D300000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * |  IPQ5018 |              |                         |
+	 * |  Caldb   |  0x4D400000  |           2MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_1|              |                         |
+	 * |   data   |  0x4D600000  |          16MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_1|              |                         |
+	 * |  M3 Dump |  0x4E600000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_1|              |                         |
+	 * |   QDSS   |  0x4E700000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_1|              |                         |
+	 * |  Caldb   |  0x4E800000  |           5MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_2|              |                         |
+	 * |   data   |  0x4ED00000  |          16MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_2|              |                         |
+	 * |  M3 Dump |  0x4FD00000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_2|              |                         |
+	 * |   QDSS   |  0x4FE00000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_2|              |                         |
+	 * |  Caldb   |  0x4FF00000  |           5MB           |
+	 * +----------+--------------+-------------------------+
+	 * |                                                   |
+	 * |            Rest of the memory for Linux           |
+	 * |                                                   |
+	 * +===================================================+
+	 */
+		q6_mem_regions: q6_mem_regions@4B000000 {
+			no-map;
+			reg = <0x0 0x4B000000 0x0 0x5400000>;
+		};
+
+		q6_code_data: q6_code_data@4B000000 {
+			no-map;
+			reg = <0x0 0x4B000000 0x0 01400000>;
+		};
+
+		q6_ipq5018_data: q6_ipq5018_data@4C400000 {
+			no-map;
+			reg = <0x0 0x4C400000 0x0 0xE00000>;
+		};
+
+		m3_dump: m3_dump@4D200000 {
+			no-map;
+			reg = <0x0 0x4D200000 0x0 0x100000>;
+		};
+
+		q6_etr_region: q6_etr_dump@4D300000 {
+			no-map;
+			reg = <0x0 0x4D300000 0x0 0x100000>;
+		};
+
+		q6_caldb_region: q6_caldb_region@4D400000 {
+			no-map;
+			reg = <0x0 0x4D400000 0x0 0x200000>;
+		};
+
+		q6_qcn6122_data1: q6_qcn6122_data1@4D600000 {
+			no-map;
+			reg = <0x0 0x4D600000 0x0 0x1000000>;
+		};
+
+		m3_dump_qcn6122_1: m3_dump_qcn6122_1@4E600000 {
+			no-map;
+			reg = <0x0 0x4E600000 0x0 0x100000>;
+		};
+
+		q6_qcn6122_etr_1: q6_qcn6122_etr_1@4E700000 {
+			no-map;
+			reg = <0x0 0x4E700000 0x0 0x100000>;
+		};
+
+		q6_qcn6122_caldb_1: q6_qcn6122_caldb_1@4E800000 {
+			no-map;
+			reg = <0x0 0x4E800000 0x0 0x500000>;
+		};
+
+		q6_qcn6122_data2: q6_qcn6122_data2@4E900000 {
+			no-map;
+			reg = <0x0 0x4ED00000 0x0 0x1000000>;
+		};
+
+		m3_dump_qcn6122_2: m3_dump_qcn6122_2@4FD00000 {
+			no-map;
+			reg = <0x0 0x4FD00000 0x0 0x100000>;
+		};
+
+		q6_qcn6122_etr_2: q6_qcn6122_etr_2@4FE00000 {
+			no-map;
+			reg = <0x0 0x4FE00000 0x0 0x100000>;
+		};
+
+		q6_qcn6122_caldb_2: q6_qcn6122_caldb_2@4FF00000 {
+			no-map;
+			reg = <0x0 0x4FF00000 0x0 0x500000>;
+		};
+
+	#endif
 	};
 
 	soc {
 		serial@78af000 {
 			status = "ok";
 		};
-
-		/*
+/*
 		blsp1_uart2: serial@78b0000 {
 			pinctrl-0 = <&blsp1_uart_pins>;
 			pinctrl-names = "default";
 		};
-		*/
-
+*/
 		qpic_bam: dma@7984000{
 			status = "ok";
 		};
@@ -258,7 +371,6 @@
 					port@0 {
 						port_id = <1>;
 						phy_address = <7>;
-					//	mdiobus = <&mdio0>;
 					};
 					port@1 {
 						port_id = <2>;
@@ -271,10 +383,9 @@
 					mode = "normal";
 					speed = "all";
 					blink_en = "enable";
-					active = "low";
+					active = "high";
 				};
 			};
-
 			ess-switch1@1 {
 				compatible = "qcom,ess-switch-qca83xx";
 				device_id = <1>;
@@ -282,7 +393,7 @@
 				mdio-bus = <&mdio1>;
 				reset_gpio = <0x26>;
 				switch_cpu_bmp = <0x40>;  /* cpu port bitmap (Port 6 GMAC) */
-				switch_lan_bmp = <0x1e>; /* lan port bitmap */
+				switch_lan_bmp = <0x3c>; /* lan port bitmap */
 				switch_wan_bmp = <0x0>;  /* wan port bitmap */
 				qca,ar8327-initvals = <
 						0x00004 0x7600000   /* PAD0_MODE */
@@ -311,15 +422,13 @@
 						port_id = <4>;
 						phy_address = <3>;
 					};
+					port@4 {
+						port_id = <5>;
+						phy_address = <4>;
+					};
 				};
 			};
 		};
-
-		qcom_q6v5_wcss@CD00000 {
-			memory-region = <&q6_mem_regions>;
-		};
-
-
 		dp1 {
 			device_type = "network";
 			compatible = "qcom,nss-dp";
@@ -333,9 +442,41 @@
 			phy-mode = "sgmii";
 		};
 
+		dp2 {
+			device_type = "network";
+			compatible = "qcom,nss-dp";
+			clocks = <&gcc GCC_SNOC_GMAC0_AXI_CLK>;
+			clock-names = "nss-snoc-gmac-axi-clk";
+			qcom,id = <1>;
+			reg = <0x39C00000 0x10000>;
+			interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
+			qcom,mactype = <2>;
+			qcom,link-poll = <1>;
+			qcom,phy-mdio-addr = <7>;
+			mdio-bus = <&mdio0>;
+			local-mac-address = [000000000000];
+			phy-mode = "sgmii";
+		};
+
 		qcom,test@0 {
 			status = "ok";
 		};
+
+/*
+		lpass: lpass@0xA000000{
+			status = "disabled";
+		};
+
+		pcm: pcm@0xA3C0000{
+			pinctrl-0 = <&audio_pins>;
+			pinctrl-names = "default";
+			status = "disabled";
+		};
+
+		pcm_lb: pcm_lb@0 {
+			status = "disabled";
+		};
+*/
 	};
 
 	thermal-zones {
@@ -343,12 +484,8 @@
 	};
 };
 
-&sdhc_1 {
-	status = "disabled";
-};
-
 &tlmm {
-	pinctrl-0 = <&blsp0_uart_pins>;
+	pinctrl-0 = <&blsp0_uart_pins>; //<&blsp0_uart_pins &phy_led_pins>;
 	pinctrl-names = "default";
 
 	blsp0_uart_pins: blsp0_uart_pins {
@@ -358,44 +495,15 @@
 			bias-disable;
 		};
 	};
-
-	/*
+/*
 	blsp1_uart_pins: blsp1_uart_pins {
-		blsp1_uart_rx {
-			pins = "gpio23";
+		blsp1_uart_rx_tx {
+			pins = "gpio23", "gpio25", "gpio24", "gpio26";
 			function = "blsp1_uart2";
-			drive-strength = <8>;
-			input-enable;
 			bias-disable;
-			bias-pull-up;
-		};
-		blsp1_uart_tx {
-			pins = "gpio25";
-			function = "blsp1_uart2";
-			drive-strength = <8>;
-			bias-disable;
-			output-high;
-			bias-pull-up;
-		};
-		blsp1_uart_rfr {
-			pins = "gpio24";
-			function = "blsp1_uart2";
-			drive-strength = <8>;
-			bias-disable;
-			output-high;
-			bias-pull-up;
-		};
-		blsp1_uart_cts {
-			pins = "gpio26";
-			function = "blsp1_uart2";
-			drive-strength = <8>;
-			bias-disable;
-			input-enable;
-			bias-pull-up;
 		};
 	};
-	*/
-
+*/
 	blsp0_spi_pins: blsp0_spi_pins {
 		mux {
 			pins = "gpio10", "gpio11", "gpio12", "gpio13";
@@ -405,56 +513,6 @@
 		};
 	};
 
-	/*
-	phy_pins: phy_pins {
-		phy_intr {
-			pins = "gpio25";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-disable;
-		};
-		phy_reset {
-			pins = "gpio26";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-pull-down;
-			output-low;
-		};
-	};
-	*/
-
-	mdio1_pins: mdio_pinmux {
-		mux_0 {
-			pins = "gpio36";
-			function = "mdc";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-
-		mux_1 {
-			pins = "gpio37";
-			function = "mdio";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-	};
-
-	i2c_pins: i2c_pins {
-		i2c_scl {
-			pins = "gpio25";
-			function = "blsp2_i2c1";
-			drive-strength = <8>;
-			bias-disable;
-		};
-
-		i2c_sda {
-			pins = "gpio26";
-			function = "blsp2_i2c1";
-			drive-strength = <8>;
-			bias-disable;
-		};
-	};
-
 	qspi_nand_pins: qspi_nand_pins {
 		qspi_clock {
 			pins = "gpio9";
@@ -494,6 +552,47 @@
 		};
 	};
 
+	mdio1_pins: mdio_pinmux {
+		mux_0 {
+			pins = "gpio36";
+			function = "mdc";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+
+		mux_1 {
+			pins = "gpio37";
+			function = "mdio";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+	};
+/*
+	phy_led_pins: phy_led_pins {
+		gephy_led_pin {
+			pins = "gpio46";
+			function = "led0";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+	};
+*/
+	i2c_pins: i2c_pins {
+		i2c_scl {
+			pins = "gpio25";
+			function = "blsp2_i2c1";
+			drive-strength = <8>;
+			bias-disable;
+		};
+
+		i2c_sda {
+			pins = "gpio26";
+			function = "blsp2_i2c1";
+			drive-strength = <8>;
+			bias-disable;
+		};
+	};
+
 	button_pins: button_pins {
 		reset_button {
 			pins = "gpio28";
@@ -502,13 +601,64 @@
 			bias-pull-up;
 		};
 	};
+/*
+	audio_pins: audio_pinmux {
+		mux_1 {
+			pins = "gpio24";
+			function = "audio_rxbclk";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
 
+		mux_2 {
+			pins = "gpio25";
+			function = "audio_rxfsync";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+
+		mux_3 {
+			pins = "gpio26";
+			function = "audio_rxd";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+
+		mux_4 {
+			pins = "gpio27";
+			function = "audio_txmclk";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+
+		mux_5 {
+			pins = "gpio28";
+			function = "audio_txbclk";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+
+		mux_6 {
+			pins = "gpio29";
+			function = "audio_txfsync";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+
+		mux_7 {
+			pins = "gpio30";
+			function = "audio_txd";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+	};
+*/
 	poe_pins: poe_pinmux {
 		/*
 			LAN port PoE output enable
 			H --> enable; L --> disable (Default setting to H)
 		*/
-		mux_0 {
+		mux_0 { /* PoE_OUT_EN */
 			pins = "gpio24";
 			function = "gpio";
 			drive-strength = <2>;
@@ -531,14 +681,12 @@
 			drive-strength = <8>;
 			bias-disable;
 		};
-
 		sys_blue {
 			pins = "gpio30";
 			function = "gpio";
 			drive-strength = <8>;
 			bias-pull-up;
 		};
-
 		sys_red {
 			pins = "gpio46";
 			function = "gpio";
@@ -572,36 +720,23 @@
 			label = "sys:green";
 			gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>;  /* GPIO_1/ATST_QP0 */
 			default-state="off";
-		/*	linux,default-trigger = "timer";
-			active-delay = <700>;
-			inactive-delay = <700>;
-			default-state="on";		*/
 		};
-
 		led@30 {
 			label = "sys:blue";
 			gpios = <&tlmm 30 GPIO_ACTIVE_HIGH>;  /* GPIO_30 */
 			default-state="on";
-		/*	linux,default-trigger = "timer";
-			active-delay = <700>;
-			inactive-delay = <700>;
-			default-state="on";		*/
 		};
-
 		led@46 {
 			label = "sys:red";
 			gpios = <&tlmm 46 GPIO_ACTIVE_HIGH>;  /* GPIO_46 */
 			default-state="off";
-		/*	linux,default-trigger = "timer";
-			active-delay = <700>;
-			inactive-delay = <700>;
-			default-state="on";		*/
 		};
 	};
 };
 
 &usb3 {
 	status = "disabled";
+	device-power-gpio = <&tlmm 24 1>;
 };
 
 &eud {
@@ -610,7 +745,7 @@
 
 &pcie_x1 {
 	status = "disabled";
-	perst-gpio = <&tlmm 27 1>;
+	perst-gpio = <&tlmm 18 1>;
 };
 
 &pcie_x2 {
@@ -618,6 +753,10 @@
 	perst-gpio = <&tlmm 15 1>;
 };
 
+&bt {
+	status = "disabled";
+};
+
 &dwc_0 {
 	/delete-property/ #phy-cells;
 	/delete-property/ phys;
@@ -637,7 +776,7 @@
 };
 
 &pcie_x1_rp {
-	status = "disabled";
+        status = "disabled";
 
 	mhi_0: qcom,mhi@0 {
 		reg = <0 0 0 0 0 >;
@@ -645,10 +784,11 @@
 };
 
 &pcie_x2_rp {
-	status = "disabled";
+        status = "disabled";
 
 	mhi_1: qcom,mhi@1 {
 		reg = <0 0 0 0 0 >;
+
 	};
 };
 
@@ -662,12 +802,11 @@
 
 &qcom_q6v5_wcss {
 	qcom,multipd_arch;
+	memory-region = <&q6_mem_regions>;
 	qcom,share_bootargs;
 	qcom,bootargs_smem = <507>;
-	/* Please refer the IPQ50xx SoC Software doc to define pcie reset pin */
 	boot-args = <0x1 0x4 0x3 0x0F 0x0 0x0>,
-			<0x2 0x4 0x2 0x0F 0x0 0x0>;
-
+			<0x2 0x4 0x2 0x12 0x0 0x0>;
 	/* IPQ5018 */
 	q6v5_wcss_userpd1 {
 		m3_firmware = "IPQ5018/m3_fw.mdt";
@@ -688,8 +827,13 @@
 		qca,asid = <1>;
 		qca,auto-restart;
 		qca,int_radio;
+		#ifdef __IPQ_MEM_PROFILE_256_MB__
 		memory-region = <&q6_ipq5018_data>, <&m3_dump>,
 				<&q6_etr_region>;
+		#else
+		memory-region = <&q6_ipq5018_data>, <&m3_dump>,
+				<&q6_etr_region>, <&q6_caldb_region>;
+		#endif
 	};
 
 	/* QCN6122 6G */
@@ -711,8 +855,13 @@
 			"spawn";
 		qca,asid = <2>;
 		qca,auto-restart;
+		#ifdef __IPQ_MEM_PROFILE_256_MB__
 		memory-region = <&q6_qcn6122_data1>, <&m3_dump_qcn6122_1>,
 				<&q6_qcn6122_etr_1>;
+		#else
+		memory-region = <&q6_qcn6122_data1>, <&m3_dump_qcn6122_1>,
+				<&q6_qcn6122_etr_1>, <&q6_qcn6122_caldb_1>;
+		#endif
 	};
 
 	/* QCN6122 5G */
@@ -734,8 +883,13 @@
 			"spawn";
 		qca,asid = <3>;
 		qca,auto-restart;
+		#ifdef __IPQ_MEM_PROFILE_256_MB__
 		memory-region = <&q6_qcn6122_data2>, <&m3_dump_qcn6122_2>,
 				<&q6_qcn6122_etr_2>;
+		#else
+		memory-region = <&q6_qcn6122_data2>, <&m3_dump_qcn6122_2>,
+				<&q6_qcn6122_etr_2>, <&q6_qcn6122_caldb_2>;
+		#endif
 	};
 };
 
@@ -753,39 +907,65 @@
 	status = "ok";
 };
 
-
 &wifi0 {
-	/* IPQ5018  24G*/
+	/* IPQ5018 */
 	qcom,multipd_arch;
 	qcom,userpd-subsys-name = "q6v5_wcss_userpd1";
+#ifdef __IPQ_MEM_PROFILE_256_MB__
 	qcom,tgt-mem-mode = <2>;
+#else
+	qcom,tgt-mem-mode = <1>;
+#endif
 	qcom,board_id = <0x24>;
 	qcom,bdf-addr = <0x4C400000 0x4C400000 0x4C400000 0x0 0x0>;
+#ifdef __CNSS2__
+	qcom,caldb-addr = <0x4D400000 0x4D400000 0 0 0>;
+#else
 	qcom,caldb-addr = <0x4D400000>;
-	qcom,caldb-size = <0x200000>;
-	nss-radio-priority = <0>;
 	m3-dump-addr = <0x4D200000>;
-	mem-region = <&q6_ipq5018_data>;
-
+#endif
+	qcom,caldb-size = <0x200000>;
 	status = "ok";
 };
 
 &wifi1 {
-	/* QCN6122 5G */
+	/* QCN6122 6G */
 	qcom,multipd_arch;
-	qcom,userpd-subsys-name = "q6v5_wcss_userpd2";
+	qcom,userpd-subsys-name = "q6v5_wcss_userpd3";
+#ifdef __IPQ_MEM_PROFILE_256_MB__
 	qcom,tgt-mem-mode = <2>;
+#else
+	qcom,tgt-mem-mode = <1>;
+#endif
 	qcom,board_id = <0x60>;
-	qcom,bdf-addr = <0x4D600000 0x4D600000 0x4D300000 0x0 0x0>;
-	qcom,caldb-addr = <0x4E800000>;
-	m3-dump-addr = <0x4E600000>;
-	nss-radio-priority = <1>;
-	mem-region = <&q6_qcn6122_data1>;
+	qcom,bdf-addr = <0x4ED00000 0x4ED00000 0x4E400000 0x0 0x0>;
+#ifdef __CNSS2__
+	qcom,caldb-addr = <0x4FF00000 0x4FF00000 0 0 0>;
+#else
+	qcom,caldb-addr = <0x4FF00000>;
+	m3-dump-addr = <0x4FD00000>;
+#endif
 	qcom,caldb-size = <0x500000>;
 	status = "ok";
 };
 
 &wifi2 {
+	/* QCN6122 6G */
+	qcom,multipd_arch;
+	qcom,userpd-subsys-name = "q6v5_wcss_userpd3";
+#ifdef __IPQ_MEM_PROFILE_256_MB__
+	qcom,tgt-mem-mode = <2>;
+#else
+	qcom,tgt-mem-mode = <1>;
+#endif
+	qcom,board_id = <0xb0>;
+	qcom,bdf-addr = <0x4ED00000 0x4ED00000 0x4E400000 0x0 0x0>;
+#ifdef __CNSS2__
+	qcom,caldb-addr = <0x4FF00000 0x4FF00000 0 0 0>;
+#else
+	qcom,caldb-addr = <0x4FF00000>;
+	m3-dump-addr = <0x4FD00000>;
+#endif
+	qcom,caldb-size = <0x500000>;
 	status = "disabled";
 };
-
diff --git a/feeds/ipq807x/ipq807x/image/ipq50xx.mk b/feeds/ipq807x/ipq807x/image/ipq50xx.mk
index fd9d721fb..da7c77725 100644
--- a/feeds/ipq807x/ipq807x/image/ipq50xx.mk
+++ b/feeds/ipq807x/ipq807x/image/ipq50xx.mk
@@ -69,7 +69,7 @@ define Device/cybertan_eww631_b1
   DEVICE_DTS := qcom-ipq5018-eww631-b1
   SUPPORTED_DEVICES := cybertan,eww631-b1
   DEVICE_PACKAGES := ath11k-wifi-cybertan-eww631-b1 ath11k-firmware-ipq50xx-spruce ath11k-firmware-qcn6122
-  DEVICE_DTS_CONFIG := config@mp02.1
+  DEVICE_DTS_CONFIG := config@mp03.5-c1
 endef
 TARGET_DEVICES += cybertan_eww631_b1
 
diff --git a/feeds/ipq807x/qca-thermald-10.4/src/ipq-thermald-cybertan-eww631-a1.conf b/feeds/ipq807x/qca-thermald-10.4/src/ipq-thermald-cybertan-eww631-a1.conf
index 6f50e8389..9328b5cfe 100755
--- a/feeds/ipq807x/qca-thermald-10.4/src/ipq-thermald-cybertan-eww631-a1.conf
+++ b/feeds/ipq807x/qca-thermald-10.4/src/ipq-thermald-cybertan-eww631-a1.conf
@@ -3,13 +3,13 @@ sampling 5000
 [tsens_tz_sensor1]
 sampling 	5000
 thresholds 			105			110			115			119			120
-thresholds_clr		0			100			105			110			115
+thresholds_clr 		0			100			105			110			115
 actions 			cooling		cooling	 	cooling		cooling		shutdown
-action_info 		35			35	 		50			70			800000
+action_info 		0			35	 		50			70			800000
 
 [tsens_tz_sensor4]
 sampling 	5000
-thresholds			105			107			112			119			120
-thresholds_clr		0			100			105			110			115
-actions 			cooling	 	cooling		cooling		cooling		shutdown
-action_info			0			20			30	 		50			800000
\ No newline at end of file
+thresholds 			105			110			115			119			120
+thresholds_clr 		0			100			105			110			115
+actions 			cooling		cooling		cooling		cooling		shutdown
+action_info 		0			20			30	 		50			800000
\ No newline at end of file
diff --git a/feeds/ipq807x/qca-thermald-10.4/src/ipq-thermald-cybertan-eww631-b1.conf b/feeds/ipq807x/qca-thermald-10.4/src/ipq-thermald-cybertan-eww631-b1.conf
index b130b03b1..afe15a3bc 100755
--- a/feeds/ipq807x/qca-thermald-10.4/src/ipq-thermald-cybertan-eww631-b1.conf
+++ b/feeds/ipq807x/qca-thermald-10.4/src/ipq-thermald-cybertan-eww631-b1.conf
@@ -2,14 +2,14 @@ sampling 5000
 
 [tsens_tz_sensor1]
 sampling 	5000
-thresholds			70			80			90			105			115			120
-thresholds_clr		0			75			85			100			110			113
-actions				cooling		cooling		cooling		cooling		cooling		shutdown
-action_info 		0			25	 		45			65			90			800000
+thresholds 			105			115			119			125
+thresholds_clr 		0			105			110			120
+actions 			cooling		cooling	 	cooling		cooling
+action_info 		0			20	 		50			70
 
 [tsens_tz_sensor4]
 sampling 	5000
-thresholds			70			80			90			105			115			120
-thresholds_clr		0			75			85			100			110			113
-actions 			cooling		cooling		cooling		cooling		cooling		shutdown
-action_info 		0			15			25			45			60			800000
\ No newline at end of file
+thresholds 			105			115			119			125
+thresholds_clr 		0			105			110			120
+actions 			cooling		cooling		cooling		cooling
+action_info 		0			20			50	 		70
\ No newline at end of file
diff --git a/feeds/wifi-ax/ath11k-wifi/board-cybertan-eww631-a1.bin.IPQ5018 b/feeds/wifi-ax/ath11k-wifi/board-cybertan-eww631-a1.bin.IPQ5018
index 2d45b8c16..d2809f880 100644
Binary files a/feeds/wifi-ax/ath11k-wifi/board-cybertan-eww631-a1.bin.IPQ5018 and b/feeds/wifi-ax/ath11k-wifi/board-cybertan-eww631-a1.bin.IPQ5018 differ
diff --git a/feeds/wifi-ax/ath11k-wifi/board-cybertan-eww631-a1.bin.QCN6122 b/feeds/wifi-ax/ath11k-wifi/board-cybertan-eww631-a1.bin.QCN6122
index 225344646..c4b904c72 100644
Binary files a/feeds/wifi-ax/ath11k-wifi/board-cybertan-eww631-a1.bin.QCN6122 and b/feeds/wifi-ax/ath11k-wifi/board-cybertan-eww631-a1.bin.QCN6122 differ
diff --git a/feeds/wifi-ax/ath11k-wifi/board-cybertan-eww631-b1.bin.IPQ5018 b/feeds/wifi-ax/ath11k-wifi/board-cybertan-eww631-b1.bin.IPQ5018
old mode 100644
new mode 100755
index 2d45b8c16..523964f96
Binary files a/feeds/wifi-ax/ath11k-wifi/board-cybertan-eww631-b1.bin.IPQ5018 and b/feeds/wifi-ax/ath11k-wifi/board-cybertan-eww631-b1.bin.IPQ5018 differ
diff --git a/feeds/wifi-ax/ath11k-wifi/board-cybertan-eww631-b1.bin.QCN6122 b/feeds/wifi-ax/ath11k-wifi/board-cybertan-eww631-b1.bin.QCN6122
old mode 100644
new mode 100755
index 225344646..0edab9349
Binary files a/feeds/wifi-ax/ath11k-wifi/board-cybertan-eww631-b1.bin.QCN6122 and b/feeds/wifi-ax/ath11k-wifi/board-cybertan-eww631-b1.bin.QCN6122 differ
diff --git a/profiles/cybertan_eww631-b1.yml b/profiles/cybertan_eww631-b1.yml
index 9304e4f46..9588a3bdc 100644
--- a/profiles/cybertan_eww631-b1.yml
+++ b/profiles/cybertan_eww631-b1.yml
@@ -12,6 +12,3 @@ packages:
 include:
   - wifi-ax
   - ucentral-ap
-diffconfig: |
-  CONFIG_KERNEL_IPQ_MEM_PROFILE=256
-  CONFIG_KERNEL_ARCH_IPQ256M=y