diff --git a/target/linux/qualcommax/config-6.1 b/target/linux/qualcommax/config-6.1
index 8bac3fa187..7a983b961b 100644
--- a/target/linux/qualcommax/config-6.1
+++ b/target/linux/qualcommax/config-6.1
@@ -52,7 +52,6 @@ CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3_ITS_PCI=y
 # CONFIG_ARM_MHU_V2 is not set
 CONFIG_ARM_PSCI_CPUIDLE=y
-CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_QCOM_CPUFREQ_HW is not set
 CONFIG_ARM_QCOM_CPUFREQ_NVMEM=y
@@ -135,7 +134,6 @@ CONFIG_DMA_ENGINE=y
 CONFIG_DMA_OF=y
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 CONFIG_DTC=y
-CONFIG_DT_IDLE_GENPD=y
 CONFIG_DT_IDLE_STATES=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EXCLUSIVE_SYSTEM_RAM=y
@@ -200,7 +198,7 @@ CONFIG_IPQ_APSS_PLL=y
 # CONFIG_IPQ_GCC_4019 is not set
 # CONFIG_IPQ_GCC_6018 is not set
 # CONFIG_IPQ_GCC_806X is not set
-CONFIG_IPQ_GCC_8074=y
+# CONFIG_IPQ_GCC_8074 is not set
 # CONFIG_IPQ_LCC_806X is not set
 CONFIG_IRQCHIP=y
 CONFIG_IRQ_DOMAIN=y
@@ -223,9 +221,7 @@ CONFIG_MDIO_IPQ4019=y
 # CONFIG_MDM_GCC_9615 is not set
 # CONFIG_MDM_LCC_9615 is not set
 CONFIG_MEMFD_CREATE=y
-# CONFIG_MFD_HI6421_SPMI is not set
 # CONFIG_MFD_QCOM_RPM is not set
-CONFIG_MFD_SPMI_PMIC=y
 CONFIG_MFD_SYSCON=y
 CONFIG_MIGRATION=y
 CONFIG_MMC=y
@@ -279,7 +275,6 @@ CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
 CONFIG_NVMEM=y
 CONFIG_NVMEM_QCOM_QFPROM=y
 # CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
-# CONFIG_NVMEM_SPMI_SDAM is not set
 CONFIG_NVMEM_SYSFS=y
 CONFIG_NVMEM_U_BOOT_ENV=y
 CONFIG_OF=y
@@ -327,7 +322,7 @@ CONFIG_PHY_QCOM_QUSB2=y
 # CONFIG_PHY_QCOM_USB_SS is not set
 CONFIG_PINCTRL=y
 # CONFIG_PINCTRL_IPQ6018 is not set
-CONFIG_PINCTRL_IPQ8074=y
+# CONFIG_PINCTRL_IPQ8074 is not set
 CONFIG_PINCTRL_MSM=y
 # CONFIG_PINCTRL_MSM8916 is not set
 # CONFIG_PINCTRL_MSM8976 is not set
@@ -335,7 +330,6 @@ CONFIG_PINCTRL_MSM=y
 # CONFIG_PINCTRL_MSM8996 is not set
 # CONFIG_PINCTRL_MSM8998 is not set
 # CONFIG_PINCTRL_QCM2290 is not set
-CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 # CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set
 # CONFIG_PINCTRL_QCS404 is not set
 # CONFIG_PINCTRL_SC7180 is not set
@@ -348,15 +342,11 @@ CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 # CONFIG_PINCTRL_SM8250 is not set
 # CONFIG_PINCTRL_SM8450 is not set
 CONFIG_PM=y
-# CONFIG_PM8916_WATCHDOG is not set
 CONFIG_PM_CLK=y
-CONFIG_PM_GENERIC_DOMAINS=y
-CONFIG_PM_GENERIC_DOMAINS_OF=y
 CONFIG_PM_OPP=y
 CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_MSM is not set
-# CONFIG_POWER_RESET_QCOM_PON is not set
 CONFIG_POWER_SUPPLY=y
 CONFIG_PREEMPT_NONE_BUILD=y
 CONFIG_PRINTK_TIME=y
@@ -366,18 +356,16 @@ CONFIG_PTP_1588_CLOCK_OPTIONAL=y
 # CONFIG_QCOM_A53PLL is not set
 # CONFIG_QCOM_AOSS_QMP is not set
 CONFIG_QCOM_APCS_IPC=y
-CONFIG_QCOM_APM=y
+# CONFIG_QCOM_APM is not set
 # CONFIG_QCOM_APR is not set
 CONFIG_QCOM_BAM_DMA=y
 # CONFIG_QCOM_CLK_APCC_MSM8996 is not set
 # CONFIG_QCOM_CLK_APCS_MSM8916 is not set
 # CONFIG_QCOM_CLK_APCS_SDX55 is not set
-# CONFIG_QCOM_COINCELL is not set
 # CONFIG_QCOM_COMMAND_DB is not set
 # CONFIG_QCOM_CPR is not set
 # CONFIG_QCOM_EBI2 is not set
 # CONFIG_QCOM_FASTRPC is not set
-CONFIG_QCOM_GDSC=y
 # CONFIG_QCOM_GENI_SE is not set
 # CONFIG_QCOM_GSBI is not set
 # CONFIG_QCOM_HFPLL is not set
@@ -406,12 +394,9 @@ CONFIG_QCOM_SMP2P=y
 # CONFIG_QCOM_SMSM is not set
 CONFIG_QCOM_SOCINFO=y
 # CONFIG_QCOM_SPM is not set
-CONFIG_QCOM_SPMI_ADC5=y
-# CONFIG_QCOM_SPMI_RRADC is not set
 # CONFIG_QCOM_STATS is not set
 # CONFIG_QCOM_SYSMON is not set
 CONFIG_QCOM_TSENS=y
-CONFIG_QCOM_VADC_COMMON=y
 # CONFIG_QCOM_WCNSS_CTRL is not set
 # CONFIG_QCOM_WCNSS_PIL is not set
 CONFIG_QCOM_WDT=y
@@ -425,15 +410,9 @@ CONFIG_RAS=y
 CONFIG_RATIONAL=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_MMIO=y
-CONFIG_REGMAP_SPMI=y
 CONFIG_REGULATOR=y
-CONFIG_REGULATOR_CPR3=y
-# CONFIG_REGULATOR_CPR3_NPU is not set
-CONFIG_REGULATOR_CPR4_APSS=y
+# CONFIG_REGULATOR_CPR3 is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
-# CONFIG_REGULATOR_QCOM_LABIBB is not set
-CONFIG_REGULATOR_QCOM_SPMI=y
-# CONFIG_REGULATOR_QCOM_USB_VBUS is not set
 # CONFIG_REGULATOR_VQMMC_IPQ4019 is not set
 CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=y
@@ -454,7 +433,6 @@ CONFIG_RPMSG_QCOM_SMD=y
 # CONFIG_RPMSG_TTY is not set
 CONFIG_RPS=y
 CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_PM8XXX=y
 CONFIG_RTC_I2C_AND_SPI=y
 CONFIG_RWSEM_SPIN_ON_OWNER=y
 # CONFIG_SCHED_CORE is not set
@@ -512,10 +490,6 @@ CONFIG_SPI=y
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_MEM=y
 CONFIG_SPI_QUP=y
-CONFIG_SPMI=y
-# CONFIG_SPMI_HISI3670 is not set
-CONFIG_SPMI_MSM_PMIC_ARB=y
-# CONFIG_SPMI_PMIC_CLKDIV is not set
 CONFIG_SRCU=y
 CONFIG_SWIOTLB=y
 CONFIG_SWPHY=y
diff --git a/target/linux/qualcommax/ipq807x/config-default b/target/linux/qualcommax/ipq807x/config-default
new file mode 100644
index 0000000000..18483d05b4
--- /dev/null
+++ b/target/linux/qualcommax/ipq807x/config-default
@@ -0,0 +1,30 @@
+CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y
+CONFIG_DT_IDLE_GENPD=y
+CONFIG_IPQ_GCC_8074=y
+# CONFIG_MFD_HI6421_SPMI is not set
+CONFIG_MFD_SPMI_PMIC=y
+# CONFIG_NVMEM_SPMI_SDAM is not set
+CONFIG_PINCTRL_IPQ8074=y
+CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
+# CONFIG_PM8916_WATCHDOG is not set
+CONFIG_PM_GENERIC_DOMAINS=y
+CONFIG_PM_GENERIC_DOMAINS_OF=y
+# CONFIG_POWER_RESET_QCOM_PON is not set
+CONFIG_QCOM_APM=y
+# CONFIG_QCOM_COINCELL is not set
+CONFIG_QCOM_GDSC=y
+CONFIG_QCOM_SPMI_ADC5=y
+# CONFIG_QCOM_SPMI_RRADC is not set
+CONFIG_QCOM_VADC_COMMON=y
+CONFIG_REGMAP_SPMI=y
+CONFIG_REGULATOR_CPR3=y
+# CONFIG_REGULATOR_CPR3_NPU is not set
+CONFIG_REGULATOR_CPR4_APSS=y
+# CONFIG_REGULATOR_QCOM_LABIBB is not set
+CONFIG_REGULATOR_QCOM_SPMI=y
+# CONFIG_REGULATOR_QCOM_USB_VBUS is not set
+CONFIG_RTC_DRV_PM8XXX=y
+CONFIG_SPMI=y
+# CONFIG_SPMI_HISI3670 is not set
+CONFIG_SPMI_MSM_PMIC_ARB=y
+# CONFIG_SPMI_PMIC_CLKDIV is not set