diff --git a/arch/arm64/configs/vendor/neo_la_GKI.config b/arch/arm64/configs/vendor/neo_la_GKI.config
index 990b84c13322..9e4f99dbef14 100644
--- a/arch/arm64/configs/vendor/neo_la_GKI.config
+++ b/arch/arm64/configs/vendor/neo_la_GKI.config
@@ -24,6 +24,8 @@ CONFIG_GH_VIRT_WATCHDOG=m
 CONFIG_GUNYAH_DRIVERS=y
 # CONFIG_HVC_GUNYAH is not set
 CONFIG_HWSPINLOCK_QCOM=m
+CONFIG_I2C_EUSB2_REPEATER=m
+CONFIG_I2C_MSM_GENI=m
 CONFIG_INIT_ON_FREE_DEFAULT_ON=y
 CONFIG_INTERCONNECT_QCOM_BCM_VOTER=m
 CONFIG_INTERCONNECT_QCOM_DEBUG=m
@@ -36,6 +38,7 @@ CONFIG_MFD_I2C_PMIC=m
 # CONFIG_MODULE_SIG_ALL is not set
 CONFIG_MSM_BOOT_STATS=m
 CONFIG_MSM_CORE_HANG_DETECT=m
+CONFIG_MSM_GPI_DMA=m
 CONFIG_MSM_PERFORMANCE=m
 CONFIG_MSM_SYSSTATS=m
 CONFIG_PDR_INDICATION_NOTIF_TIMEOUT=9000
@@ -95,6 +98,8 @@ CONFIG_REGULATOR_QCOM_PM8008=m
 CONFIG_REGULATOR_QTI_FIXED_VOLTAGE=m
 CONFIG_REGULATOR_RPMH=m
 CONFIG_SCHED_WALT=m
+CONFIG_SERIAL_MSM_GENI=m
+CONFIG_SPI_MSM_GENI=m
 CONFIG_SXR_CAMCC_NEO=m
 CONFIG_SXR_DEBUGCC_NEO=m
 CONFIG_SXR_DISPCC_NEO=m
@@ -102,4 +107,12 @@ CONFIG_SXR_GCC_NEO=m
 CONFIG_SXR_GPUCC_NEO=m
 CONFIG_SXR_TCSRCC_NEO=m
 CONFIG_SXR_VIDEOCC_NEO=m
+CONFIG_USB_CONFIGFS_F_DIAG=m
+CONFIG_USB_CONFIGFS_F_QDSS=m
+CONFIG_USB_DWC3_MSM=m
+CONFIG_USB_F_DIAG=m
+CONFIG_USB_F_QDSS=m
+CONFIG_USB_MSM_EUSB2_PHY=m
+CONFIG_USB_MSM_SSPHY_QMP=m
+CONFIG_USB_REPEATER=m
 CONFIG_VIRT_DRIVERS=y
diff --git a/arch/arm64/configs/vendor/neo_la_consolidate.config b/arch/arm64/configs/vendor/neo_la_consolidate.config
index 83455e7a85ec..8c151a331548 100644
--- a/arch/arm64/configs/vendor/neo_la_consolidate.config
+++ b/arch/arm64/configs/vendor/neo_la_consolidate.config
@@ -9,6 +9,7 @@ CONFIG_LOCALVERSION="-consolidate"
 CONFIG_LOCKDEP=y
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_LOCK_STAT=y
+CONFIG_MSM_GPI_DMA_DEBUG=y
 CONFIG_PAGE_POISONING=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_SLEEP_DEBUG=y
diff --git a/modules.list.msm.neo-la b/modules.list.msm.neo-la
index 4967e90af3c2..6c4a0904e476 100644
--- a/modules.list.msm.neo-la
+++ b/modules.list.msm.neo-la
@@ -55,7 +55,6 @@ pinctrl-neo.ko
 phy-generic.ko
 phy-qcom-emu.ko
 qcom_dma_heaps.ko
-dwc3-msm.ko
 sdhci-msm-scaling.ko
 cqhci.ko
 qcom-vadc-common.ko
diff --git a/neo_la.bzl b/neo_la.bzl
index 87e7f3852e7a..fe0b9d22cf73 100644
--- a/neo_la.bzl
+++ b/neo_la.bzl
@@ -22,10 +22,12 @@ def define_neo_la():
         "drivers/cpufreq/qcom-cpufreq-hw-debug.ko",
         "drivers/cpuidle/governors/qcom_lpm.ko",
         "drivers/dma-buf/heaps/qcom_dma_heaps.ko",
+        "drivers/dma/qcom/msm_gpi.ko",
         "drivers/edac/kryo_arm64_edac.ko",
         "drivers/edac/qcom_edac.ko",
         "drivers/firmware/qcom-scm.ko",
         "drivers/hwspinlock/qcom_hwspinlock.ko",
+        "drivers/i2c/busses/i2c-msm-geni.ko",
         "drivers/interconnect/qcom/icc-bcm-voter.ko",
         "drivers/interconnect/qcom/icc-debug.ko",
         "drivers/interconnect/qcom/icc-rpmh.ko",
@@ -69,6 +71,15 @@ def define_neo_la():
         "drivers/soc/qcom/secure_buffer.ko",
         "drivers/soc/qcom/smem.ko",
         "drivers/soc/qcom/socinfo.ko",
+        "drivers/spi/spi-msm-geni.ko",
+        "drivers/tty/serial/msm_geni_serial.ko",
+        "drivers/usb/dwc3/dwc3-msm.ko",
+        "drivers/usb/gadget/function/usb_f_diag.ko",
+        "drivers/usb/gadget/function/usb_f_qdss.ko",
+        "drivers/usb/phy/phy-msm-snps-eusb2.ko",
+        "drivers/usb/phy/phy-msm-ssusb-qmp.ko",
+        "drivers/usb/repeater/repeater.ko",
+        "drivers/usb/repeater/repeater-i2c-eusb2.ko",
         "drivers/virt/gunyah/gh_msgq.ko",
         "drivers/virt/gunyah/gh_rm_drv.ko",
         "drivers/virt/gunyah/gh_virt_wdt.ko",