Merge "arm64: defconfig: Enable MSM PCIe and MHI Host driver for lahaina"

This commit is contained in:
qctecmdr 2020-01-30 23:05:03 -08:00 • committed by Gerrit - the friendly Code Review server
commit 88353cd04a
4 changed files with 5 additions and 14 deletions

View file

@ -123,3 +123,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

View file

@ -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

View file

@ -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

View file

@ -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.