diff --git a/arch/arm64/configs/msm-perf_defconfig b/arch/arm64/configs/msm-perf_defconfig
index a3fb9c93e99f..d9d8d989cf65 100644
--- a/arch/arm64/configs/msm-perf_defconfig
+++ b/arch/arm64/configs/msm-perf_defconfig
@@ -42,6 +42,7 @@ CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_CMA=y
 CONFIG_CMDLINE="console=ttyAMA0"
 # CONFIG_EFI is not set
+CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_COMPAT=y
 CONFIG_CPU_IDLE=y
@@ -117,14 +118,13 @@ CONFIG_SPI_PL022=y
 CONFIG_SPI_QUP=y
 CONFIG_PINCTRL_MSM8996=y
 CONFIG_GPIOLIB=y
-CONFIG_GPIO_PL061=y
-CONFIG_GPIO_XGENE=y
 CONFIG_SMB1351_USB_CHARGER=y
 CONFIG_SMB135X_CHARGER=y
 CONFIG_POWER_RESET_QCOM=y
 CONFIG_QCOM_DLOAD_MODE=y
 CONFIG_POWER_RESET_XGENE=y
 CONFIG_POWER_RESET_SYSCON=y
+CONFIG_MSM_PM=y
 CONFIG_MSM_APM=y
 # CONFIG_HWMON is not set
 CONFIG_REGULATOR=y
@@ -163,7 +163,6 @@ CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_EFI=y
 CONFIG_DMADEVICES=y
 CONFIG_QCOM_BAM_DMA=y
 CONFIG_VIRTIO_PCI=y
@@ -173,10 +172,12 @@ CONFIG_STAGING=y
 CONFIG_SYNC=y
 CONFIG_SW_SYNC=y
 CONFIG_SW_SYNC_USER=y
+CONFIG_ION=y
+CONFIG_ION_MSM=y
 CONFIG_QPNP_HAPTIC=y
 CONFIG_GPIO_USB_DETECT=y
 CONFIG_REMOTE_SPINLOCK_MSM=y
-# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_ARM_SMMU=y
 CONFIG_MSM_SMEM=y
 CONFIG_MSM_SMD=y
 CONFIG_MSM_GLINK=y
@@ -189,6 +190,7 @@ CONFIG_MSM_RPM_SMD=y
 CONFIG_QCOM_BUS_SCALING=y
 CONFIG_QCOM_BUSPM_DEV=m
 CONFIG_QCOM_BUS_TOPOLOGY_ADHOC=y
+CONFIG_MSM_SPM=y
 CONFIG_QCOM_SCM=y
 CONFIG_QCOM_SCM_XPU=y
 CONFIG_QCOM_WATCHDOG_V2=y
@@ -240,47 +242,3 @@ CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
 CONFIG_CRYPTO_CRC32_ARM64=y
-CONFIG_BIF_QPNP=y
-CONFIG_GPIO_QPNP_PIN=y
-#CONFIG_GPIO_QPNP_PIN_DEBUG fails compilation hence not set for now
-CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y
-CONFIG_SENSORS_QPNP_ADC_CURRENT=y
-CONFIG_LEDS_QPNP=y
-CONFIG_LEDS_QPNP_FLASH=y
-CONFIG_LEDS_QPNP_WLED=y
-#CONFIG_QPNP_POWER_ON fails trying to find INPUT_PROP_NO_DUMMY_RELEASE
-CONFIG_QPNP_REVID=y
-CONFIG_QPNP_COINCELL=y
-CONFIG_QPNP_VIBRATOR=y
-CONFIG_STAGING=y
-CONFIG_ANDROID=y
-CONFIG_ANDROID_TIMED_OUTPUT=y
-CONFIG_QPNP_HAPTIC=y
-CONFIG_QPNP_SMBCHARGER=y
-CONFIG_QPNP_FG=y
-CONFIG_SMB135X_CHARGER=y
-CONFIG_SMB1351_USB_CHARGER=y
-#CONFIG_MSM_BCL_CTL locks up
-#CONFIG_MSM_BCL_PERIPHERAL_CTL locks up
-CONFIG_PWM_QPNP=y
-CONFIG_REGULATOR_QPNP=y
-CONFIG_REGULATOR_QPNP_LABIBB=y
-CONFIG_REGULATOR_SPM=y
-#CONFIG_RTC_DRV_QPNP missing power_on_alarm_init
-CONFIG_THERMAL_QPNP=y
-CONFIG_THERMAL_QPNP_ADC_TM=y
-CONFIG_GPIO_USB_DETECT=y
-CONFIG_REGULATOR_PROXY_CONSUMER=y
-CONFIG_REGULATOR_MEM_ACC=y
-CONFIG_REGULATOR_RPM_SMD=y
-CONFIG_REGULATOR_CPR3=y
-CONFIG_REGULATOR_CPR3_HMSS=y
-CONFIG_REGULATOR_CPR3_MMSS=y
-CONFIG_REGULATOR_KRYO=y
-CONFIG_MSM_PM=y
-CONFIG_MSM_APM=y
-CONFIG_POWER_RESET_QCOM=y
-CONFIG_QCOM_DLOAD_MODE=y
-CONFIG_QCOM_BUSPM_DEV=m
-CONFIG_QCOM_BUS_TOPOLOGY_ADHOC=y
-CONFIG_QCOM_BUS_SCALING=y
diff --git a/arch/arm64/configs/msm_defconfig b/arch/arm64/configs/msm_defconfig
index 1cd1d1f4cded..1d69e6e94062 100644
--- a/arch/arm64/configs/msm_defconfig
+++ b/arch/arm64/configs/msm_defconfig
@@ -42,8 +42,8 @@ CONFIG_KSM=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_CMA=y
 CONFIG_CMDLINE="console=ttyAMA0"
-CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y
 # CONFIG_EFI is not set
+CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_COMPAT=y
 CONFIG_CPU_IDLE=y
@@ -127,6 +127,7 @@ CONFIG_POWER_RESET_QCOM=y
 CONFIG_QCOM_DLOAD_MODE=y
 CONFIG_POWER_RESET_XGENE=y
 CONFIG_POWER_RESET_SYSCON=y
+CONFIG_MSM_PM=y
 CONFIG_MSM_APM=y
 # CONFIG_HWMON is not set
 CONFIG_MFD_SPMI_PMIC=y
@@ -139,7 +140,6 @@ CONFIG_REGULATOR_SPM=y
 CONFIG_REGULATOR_CPR3_HMSS=y
 CONFIG_REGULATOR_CPR3_MMSS=y
 CONFIG_REGULATOR_KRYO=y
-CONFIG_MSM_PM=y
 CONFIG_REGULATOR_MEM_ACC=y
 CONFIG_REGULATOR_PROXY_CONSUMER=y
 CONFIG_FB=y