diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig
index 0390e4d09241..d5eec7ed2250 100644
--- a/drivers/pci/controller/Kconfig
+++ b/drivers/pci/controller/Kconfig
@@ -303,15 +303,5 @@ config PCI_MSM
 
 	  If unsure, say N.
 
-config PCI_MSM_MSI
-	tristate "MSM PCIe MSI support"
-	depends on PCI_MSM
-	depends on PCI_MSI_IRQ_DOMAIN
-	help
-	  Say Y here if you want to enable MSI support for PCIe
-	  controller and its devices. This controller offers
-	  message signaled interrupts (MSI) allocation, routing,
-	  masking, and affinity assigning for PCIe devices.
-
 source "drivers/pci/controller/dwc/Kconfig"
 endmenu
diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile
index 174af84d539c..fff5d1cabe46 100644
--- a/drivers/pci/controller/Makefile
+++ b/drivers/pci/controller/Makefile
@@ -30,11 +30,11 @@ obj-$(CONFIG_PCIE_MEDIATEK) += pcie-mediatek.o
 obj-$(CONFIG_PCIE_MOBIVEIL) += pcie-mobiveil.o
 obj-$(CONFIG_PCIE_TANGO_SMP8759) += pcie-tango.o
 obj-$(CONFIG_VMD) += vmd.o
-obj-$(CONFIG_PCI_MSM) += pci-msm.o
-obj-$(CONFIG_PCI_MSM_MSI) += pci-msm-msi.o
 # pcie-hisi.o quirks are needed even without CONFIG_PCIE_DW
 obj-y				+= dwc/
 
+obj-$(CONFIG_PCI_MSM) += pci-msm-drv.o
+pci-msm-drv-y := pci-msm.o pci-msm-msi.o
 
 # The following drivers are for devices that use the generic ACPI
 # pci_root.c driver but don't support standard ECAM config access.