diff --git a/arch/arm64/configs/msm-auto-perf_defconfig b/arch/arm64/configs/msm-auto-perf_defconfig
index dbb75e313510..efdfb4da2de2 100644
--- a/arch/arm64/configs/msm-auto-perf_defconfig
+++ b/arch/arm64/configs/msm-auto-perf_defconfig
@@ -308,7 +308,9 @@ CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_MSM_LEGACY=y
 CONFIG_MSM_ADSPRPC=y
 CONFIG_MSM_RDBG=m
+CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MUX=y
 CONFIG_I2C_QUP=y
 CONFIG_I2C_MSM_V2=y
 CONFIG_SLIMBUS_MSM_NGD=y
@@ -369,7 +371,10 @@ CONFIG_MSM_SDE_ROTATOR=y
 CONFIG_MSM_AIS=y
 CONFIG_MSM_AIS_DEBUG=y
 CONFIG_MSM_AIS_CAMERA_SENSOR=y
+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
+CONFIG_VIDEO_ADV7481=y
 CONFIG_QCOM_KGSL=y
+CONFIG_MSM_BA_V4L2=y
 CONFIG_FB=y
 CONFIG_FB_MSM=y
 CONFIG_FB_MSM_MDSS=y
diff --git a/arch/arm64/configs/msm-auto_defconfig b/arch/arm64/configs/msm-auto_defconfig
index 553677803e42..e9ef95772ebd 100644
--- a/arch/arm64/configs/msm-auto_defconfig
+++ b/arch/arm64/configs/msm-auto_defconfig
@@ -311,7 +311,9 @@ CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_MSM_LEGACY=y
 CONFIG_MSM_ADSPRPC=y
 CONFIG_MSM_RDBG=m
+CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MUX=y
 CONFIG_I2C_QUP=y
 CONFIG_I2C_MSM_V2=y
 CONFIG_SLIMBUS_MSM_NGD=y
@@ -373,7 +375,10 @@ CONFIG_MSM_SDE_ROTATOR=y
 CONFIG_MSM_AIS=y
 CONFIG_MSM_AIS_DEBUG=y
 CONFIG_MSM_AIS_CAMERA_SENSOR=y
+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
+CONFIG_VIDEO_ADV7481=y
 CONFIG_QCOM_KGSL=y
+CONFIG_MSM_BA_V4L2=y
 CONFIG_FB=y
 CONFIG_FB_MSM=y
 CONFIG_FB_MSM_MDSS=y