diff --git a/arch/arm64/configs/vendor/gen3auto_GKI.config b/arch/arm64/configs/vendor/gen3auto_GKI.config
index 18d0ce0a267a..abade57b5e59 100644
--- a/arch/arm64/configs/vendor/gen3auto_GKI.config
+++ b/arch/arm64/configs/vendor/gen3auto_GKI.config
@@ -44,6 +44,9 @@ CONFIG_SCSI_UFS_BSG=y
 CONFIG_SCSI_UFS_CRYPTO_QTI=m
 CONFIG_QTI_CRYPTO_COMMON=m
 CONFIG_QTI_HW_KEY_MANAGER=m
+CONFIG_PCI_MSM=m
+CONFIG_MHI_BUS=m
+CONFIG_MHI_UCI=m
 CONFIG_QRTR=m
 CONFIG_QRTR_SMD=m
 CONFIG_HWSPINLOCK_QCOM=m
@@ -72,3 +75,22 @@ CONFIG_SC_GCC_SHRIKE=m
 CONFIG_SC_CAMCC_SHRIKE=m
 CONFIG_SC_DISPCC_SHRIKE=m
 CONFIG_INTERCONNECT_QCOM_SCSHRIKE=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_HSUSB_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/gen3auto_QGKI.config b/arch/arm64/configs/vendor/gen3auto_QGKI.config
index 3372d82de9d4..f3e6e7ce473f 100644
--- a/arch/arm64/configs/vendor/gen3auto_QGKI.config
+++ b/arch/arm64/configs/vendor/gen3auto_QGKI.config
@@ -28,3 +28,11 @@ CONFIG_SCSI_UFS_BSG=y
 CONFIG_SCSI_UFSHCD=y
 CONFIG_QTI_ADC_TM=y
 CONFIG_SC_DEBUGCC_SHRIKE=m
+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