diff --git a/target/linux/qualcommax/Makefile b/target/linux/qualcommax/Makefile
index bf63827ac..4d5f390a9 100644
--- a/target/linux/qualcommax/Makefile
+++ b/target/linux/qualcommax/Makefile
@@ -8,7 +8,7 @@ KERNELNAME:=Image dtbs
 CPU_TYPE:=cortex-a53
 SUBTARGETS:=ipq50xx ipq60xx ipq807x
 
-KERNEL_PATCHVER:=6.1
+KERNEL_PATCHVER:=6.12
 KERNEL_TESTING_PATCHVER:=6.6
 
 include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/qualcommax/config-6.6 b/target/linux/qualcommax/config-6.6
index 7cdb9dbd4..f8a43ea46 100644
--- a/target/linux/qualcommax/config-6.6
+++ b/target/linux/qualcommax/config-6.6
@@ -54,7 +54,6 @@ CONFIG_ARM_PSCI_CPUIDLE=y
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_QCOM_CPUFREQ_HW is not set
 CONFIG_ARM_QCOM_CPUFREQ_NVMEM=y
-CONFIG_AT803X_PHY=y
 CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_SD=y
@@ -279,7 +278,6 @@ CONFIG_NR_CPUS=4
 CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
 CONFIG_NVMEM=y
 CONFIG_NVMEM_LAYOUTS=y
-CONFIG_NVMEM_LAYOUT_U_BOOT_ENV=y
 CONFIG_NVMEM_QCOM_QFPROM=y
 # CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
 CONFIG_NVMEM_SYSFS=y
@@ -296,7 +294,6 @@ CONFIG_PADATA=y
 CONFIG_PAGE_POOL=y
 CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
 CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
-CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y
 CONFIG_PARTITION_PERCPU=y
 CONFIG_PCI=y
 CONFIG_PCIEAER=y
@@ -380,8 +377,6 @@ CONFIG_POWER_SUPPLY=y
 CONFIG_PREEMPT_NONE_BUILD=y
 CONFIG_PRINTK_TIME=y
 CONFIG_PTP_1588_CLOCK_OPTIONAL=y
-CONFIG_QCA807X_PHY=y
-CONFIG_QCA808X_PHY=y
 # CONFIG_QCM_DISPCC_2290 is not set
 # CONFIG_QCM_GCC_2290 is not set
 # CONFIG_QCOM_A53PLL is not set
@@ -404,7 +399,6 @@ CONFIG_QCOM_BAM_DMA=y
 # CONFIG_QCOM_LLCC is not set
 CONFIG_QCOM_MDT_LOADER=y
 # CONFIG_QCOM_MPM is not set
-CONFIG_QCOM_NET_PHYLIB=y
 # CONFIG_QCOM_OCMEM is not set
 # CONFIG_QCOM_PDC is not set
 CONFIG_QCOM_PIL_INFO=y
diff --git a/target/linux/qualcommax/ipq50xx/config-default b/target/linux/qualcommax/ipq50xx/config-default
index 63c1d9dd9..f920cc9c9 100644
--- a/target/linux/qualcommax/ipq50xx/config-default
+++ b/target/linux/qualcommax/ipq50xx/config-default
@@ -1,26 +1,22 @@
-CONFIG_QCOM_APM=y
-CONFIG_IPQ_GCC_5018=y
-CONFIG_PINCTRL_IPQ5018=y
-
-CONFIG_MTD_SPI_NAND=y
-CONFIG_SPI_QPIC_SNAND=y
-
-CONFIG_IPQ_CMN_PLL=y
+CONFIG_GRO_CELLS=y
 CONFIG_IPQ5018_PHY=y
+CONFIG_IPQ_CMN_PLL=y
+CONFIG_IPQ_GCC_5018=y
+CONFIG_LEDS_PWM=y
+CONFIG_MTD_SPI_NAND=y
+CONFIG_NET_DEVLINK=y
 CONFIG_NET_DSA=y
 CONFIG_NET_DSA_QCA8K=y
+CONFIG_NET_DSA_QCA8K_LEDS_SUPPORT=y
 CONFIG_NET_DSA_TAG_QCA=y
-CONFIG_QCA83XX_PHY=y
-
-CONFIG_QCOM_Q6V5_MPD=y
-CONFIG_QCOM_QMI_HELPERS=y
-
+CONFIG_PHYLINK=y
+CONFIG_PHY_QCOM_M31_USB=y
 CONFIG_PHY_QCOM_UNIPHY_PCIE_28LP=y
-CONFIG_PCIE_QCOM=y
-
+CONFIG_PINCTRL_IPQ5018=y
 CONFIG_PWM=y
 CONFIG_PWM_IPQ=y
-CONFIG_LEDS_PWM=y
-
-CONFIG_PHY_QCOM_M31_USB=y
-CONFIG_USB_DWC3_QCOM=y
+CONFIG_PWM_SYSFS=y
+CONFIG_QCA83XX_PHY=y
+CONFIG_QCOM_APM=y
+CONFIG_QCOM_Q6V5_MPD=y
+CONFIG_SPI_QPIC_SNAND=y