diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-10-06 19:59:15 +0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-10-06 19:59:15 +0400 |
| commit | f92d9ee3ab39841d1f29f2d1aa96ff7c74b36ee1 (patch) | |
| tree | c747c9ce1882b9a08d284603717890c5ef81bbf7 /drivers/pci/host/Kconfig | |
| parent | 55dd4175a4bc10d943c159dabef552baaf459a59 (diff) | |
| parent | 767ebaff4ef7235eb49ddec5d48db97b17c37cf5 (diff) | |
| download | linux-f92d9ee3ab39841d1f29f2d1aa96ff7c74b36ee1.tar.xz | |
Merge branch 'pci/host-xgene' into next
* pci/host-xgene:
arm64: dts: Add APM X-Gene PCIe device tree nodes
PCI: xgene: Add APM X-Gene PCIe driver
Conflicts:
drivers/pci/host/Kconfig
drivers/pci/host/Makefile
Diffstat (limited to 'drivers/pci/host/Kconfig')
| -rw-r--r-- | drivers/pci/host/Kconfig | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig index 34134d64f35a..413c3611886a 100644 --- a/drivers/pci/host/Kconfig +++ b/drivers/pci/host/Kconfig @@ -63,7 +63,6 @@ config PCIE_SPEAR13XX help Say Y here if you want PCIe support on SPEAr13XX SoCs. - config PCI_KEYSTONE bool "TI Keystone PCIe controller" depends on ARCH_KEYSTONE @@ -82,4 +81,14 @@ config PCIE_XILINX Say 'Y' here if you want kernel to support the Xilinx AXI PCIe Host Bridge driver. +config PCI_XGENE + bool "X-Gene PCIe controller" + depends on ARCH_XGENE + depends on OF + select PCIEPORTBUS + help + Say Y here if you want internal PCI support on APM X-Gene SoC. + There are 5 internal PCIe ports available. Each port is GEN3 capable + and have varied lanes from x1 to x8. + endmenu |