From 86c9bd5df02c4999fb573c88bbe16bc7a8bbe224 Mon Sep 17 00:00:00 2001 From: Tony Truong Date: Tue, 21 Jan 2020 16:56:11 -0800 Subject: [PATCH 1/2] msm: pcie: configure PCIe and MSI as modules in Makefile This allows to compile PCIe MSM driver as one module. As part of that remove Kconfig option PCI_MSM_MSI. Change-Id: I225b880a01cfc7b480486d7d7db9fabe86256f52 Signed-off-by: Tony Truong --- drivers/pci/controller/Kconfig | 10 ---------- drivers/pci/controller/Makefile | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) 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. From 1a54523a9600c8af4ccc2e578f5cc0b3dd7331c5 Mon Sep 17 00:00:00 2001 From: Hemant Kumar Date: Tue, 21 Jan 2020 14:59:18 -0800 Subject: [PATCH 2/2] arm64: defconfig: Enable MSM PCIe and MHI Host driver for lahaina Add configuration changes in lahaina to support MSM PCIe and MHI HOST driver. Change-Id: If6fbbaf3f8efb04566dba2a61a6c4f79dd391515 Signed-off-by: Hemant Kumar --- arch/arm64/configs/vendor/lahaina_GKI.config | 3 +++ arch/arm64/configs/vendor/lahaina_debug.config | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/vendor/lahaina_GKI.config b/arch/arm64/configs/vendor/lahaina_GKI.config index 37c82d890a37..1053f3575a6c 100644 --- a/arch/arm64/configs/vendor/lahaina_GKI.config +++ b/arch/arm64/configs/vendor/lahaina_GKI.config @@ -119,3 +119,6 @@ CONFIG_CFI_PERMISSIVE=y # CONFIG_SLIMBUS_MSM_CTRL is not set # CONFIG_SLIMBUS_MSM_NGD is not set CONFIG_USB_ROLE_SWITCH=m +CONFIG_MHI_BUS=m +CONFIG_MHI_UCI=m +CONFIG_PCI_MSM=m diff --git a/arch/arm64/configs/vendor/lahaina_debug.config b/arch/arm64/configs/vendor/lahaina_debug.config index 1861ccf098b7..40354f899557 100644 --- a/arch/arm64/configs/vendor/lahaina_debug.config +++ b/arch/arm64/configs/vendor/lahaina_debug.config @@ -34,8 +34,6 @@ CONFIG_I3C_MASTER_MSM_GENI=y # CONFIG_CDNS_I3C_MASTER is not set # CONFIG_DW_I3C_MASTER is not set CONFIG_CORESIGHT_SOURCE_ETM4X=y -CONFIG_PCI_MSM=y -CONFIG_PCI_MSM_MSI=y CONFIG_CLD_LL_CORE=y CONFIG_CNSS2=m CONFIG_CNSS2_DEBUG=y