diff --git a/arch/arm64/configs/vendor/sdmsteppeauto_GKI.config b/arch/arm64/configs/vendor/sdmsteppeauto_GKI.config
index 28ac2380a5ed..8e6099582e26 100644
--- a/arch/arm64/configs/vendor/sdmsteppeauto_GKI.config
+++ b/arch/arm64/configs/vendor/sdmsteppeauto_GKI.config
@@ -44,3 +44,33 @@ CONFIG_SPMI_PMIC_CLKDIV=m
 CONFIG_QCOM_SPMI_ADC5=m
 CONFIG_NVMEM_SPMI_SDAM=m
 CONFIG_ARM_SMMU=m
+CONFIG_MSM_SUBSYSTEM_RESTART=m
+CONFIG_SETUP_SSR_NOTIF_TIMEOUTS=y
+CONFIG_SSR_SYSMON_NOTIF_TIMEOUT=20000
+CONFIG_SSR_SUBSYS_NOTIF_TIMEOUT=20000
+CONFIG_MSM_PIL_SSR_GENERIC=m
+CONFIG_PANIC_ON_SSR_NOTIF_TIMEOUT=y
+CONFIG_QCOM_SMEM=m
+CONFIG_PINCTRL_SLPI=m
+CONFIG_PCI_MSM=m
+CONFIG_MHI_BUS=m
+CONFIG_MHI_UCI=m
+CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_DWC3=m
+CONFIG_USB_DWC3_MSM=m
+CONFIG_USB_EHSET_TEST_FIXTURE=m
+CONFIG_USB_LINK_LAYER_TEST=m
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_USB_QCOM_EMU_PHY=m
+CONFIG_USB_MSM_SSPHY_QMP=m
+CONFIG_MSM_QUSB_PHY=m
+CONFIG_USB_CONFIGFS_F_DIAG=m
+CONFIG_USB_CONFIGFS_F_CDEV=m
+CONFIG_USB_CONFIGFS_F_QDSS=m
+CONFIG_USB_BAM=m
+CONFIG_EXTCON_USB_GPIO=m
+CONFIG_MSM_GENI_SE=m
+CONFIG_SERIAL_MSM_GENI=m
+CONFIG_I2C_MSM_GENI=m
+CONFIG_SPI_MSM_GENI=m
+CONFIG_MMC_SDHCI_MSM=m
diff --git a/arch/arm64/configs/vendor/sdmsteppeauto_QGKI.config b/arch/arm64/configs/vendor/sdmsteppeauto_QGKI.config
index 8ec06115d31e..1ebea1ccf523 100644
--- a/arch/arm64/configs/vendor/sdmsteppeauto_QGKI.config
+++ b/arch/arm64/configs/vendor/sdmsteppeauto_QGKI.config
@@ -21,3 +21,11 @@ CONFIG_SCSI_UFSHCD_QTI=y
 CONFIG_SCSI_UFS_BSG=y
 CONFIG_SCSI_UFSHCD=y
 CONFIG_SM_DEBUGCC_6150=y
+CONFIG_MHI_DEBUG=y
+CONFIG_SPS_SUPPORT_NDP_BAM=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_MON=y
+CONFIG_USB_ACM=y
+CONFIG_SPS=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_SPI_SPIDEV=y
diff --git a/arch/arm64/configs/vendor/sdmsteppeauto_debug.config b/arch/arm64/configs/vendor/sdmsteppeauto_debug.config
index 934b870918a6..aab4a6a8c22a 100644
--- a/arch/arm64/configs/vendor/sdmsteppeauto_debug.config
+++ b/arch/arm64/configs/vendor/sdmsteppeauto_debug.config
@@ -4,3 +4,4 @@ CONFIG_DEBUG_SPINLOCK=y
 CONFIG_LKDTM=m
 CONFIG_ATOMIC64_SELFTEST=m
 CONFIG_RCU_TORTURE_TEST=m
+CONFIG_SERIAL_MSM_GENI_CONSOLE=y