diff --git a/package/firmware/ath11k-firmware/Makefile b/package/firmware/ath11k-firmware/Makefile
index 85cbfa87c3..ade1a0fd5d 100644
--- a/package/firmware/ath11k-firmware/Makefile
+++ b/package/firmware/ath11k-firmware/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ath11k-firmware
-PKG_SOURCE_DATE:=2024-03-14
-PKG_SOURCE_VERSION:=795809c7041582bd51bdfaa1f548b916ae8d4382
-PKG_MIRROR_HASH:=d93edc651b641a97ec4f5ed329e15ac110928f863b4afbaae7fcb25953d04544
-PKG_RELEASE:=2
+PKG_SOURCE_DATE:=2024-07-22
+PKG_SOURCE_VERSION:=935aaf53a02193b50a241f167d509718a9dd395e
+PKG_MIRROR_HASH:=adf518b384b2eb1bc424a982732f69f9db955c485d5739650ccf24cfe6edf67a
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/quic/upstream-wifi-fw.git
+PKG_SOURCE_URL:=https://github.com/qosmio/upstream-wifi-fw.git
 
 PKG_LICENSE_FILES:=LICENSE.qca_firmware
 
@@ -65,14 +65,14 @@ $(eval $(call Download,qcn9074-board))
 define Package/ath11k-firmware-ipq6018/install
 	$(INSTALL_DIR) $(1)/lib/firmware/IPQ6018
 	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/ath11k-firmware/IPQ6018/hw1.0/2.5.0.1/WLAN.HK.2.5.0.1-03982-QCAHKSWPL_SILICONZ-3/* \
+		$(PKG_BUILD_DIR)/ath11k-firmware/IPQ6018/hw1.0/testing/2.12/WLAN.HK.2.12-01368-QCAHKSWPL_SILICONZ-1/* \
 		$(1)/lib/firmware/IPQ6018/
 endef
 
 define Package/ath11k-firmware-ipq8074/install
 	$(INSTALL_DIR) $(1)/lib/firmware/IPQ8074
 	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/ath11k-firmware/IPQ8074/hw2.0/2.9.0.1/WLAN.HK.2.9.0.1-01977-QCAHKSWPL_SILICONZ-1/* \
+		$(PKG_BUILD_DIR)/ath11k-firmware/IPQ8074/hw2.0/testing/2.12/WLAN.HK.2.12-01368-QCAHKSWPL_SILICONZ-1/* \
 		$(1)/lib/firmware/IPQ8074/
 endef
 
@@ -87,4 +87,4 @@ endef
 
 $(eval $(call BuildPackage,ath11k-firmware-ipq6018))
 $(eval $(call BuildPackage,ath11k-firmware-ipq8074))
-$(eval $(call BuildPackage,ath11k-firmware-qcn9074))
+$(eval $(call BuildPackage,ath11k-firmware-qcn9074))
\ No newline at end of file
diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-jdcloud-ax6600.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-jdcloud-ax6600.dts
index 853704d5b0..8a9420bb8e 100644
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-jdcloud-ax6600.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-jdcloud-ax6600.dts
@@ -106,7 +106,7 @@
 			bias-pull-up;
 		};
 	};
-
+	
 	button_pins: button_pins {
 		joylink_button {
 			pins = "gpio72";
@@ -129,7 +129,7 @@
 			bias-pull-down;
 		};
 	};
-
+	
 	tmp1628_pins: tmp1628_pins {
 		dio {
 			pins = "gpio74";