From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 22 Jul 2014 23:55:50 +0000 (-0600)
Subject: Merge branches 'pci/host-designware', 'pci/host-mvebu' and 'pci/host-tegra' into... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=981c191778a4f92bc82456205a444d522843a630;p=linux-beck.git

Merge branches 'pci/host-designware', 'pci/host-mvebu' and 'pci/host-tegra' into next

* pci/host-designware:
  PCI: designware: Add MSI-related pcie_host_ops for v3.65 hardware
  PCI: designware: Add config access-related pcie_host_ops for v3.65 hardware
  PCI: dra7xx: Add TI DRA7xx PCIe driver
  PCI: designware: Program ATU with untranslated address
  PCI: designware: Look for configuration space in 'reg', not 'ranges'

* pci/host-mvebu:
  PCI: mvebu: Remove ARCH_KIRKWOOD dependency

* pci/host-tegra:
  PCI: tegra: Add debugfs support
---

981c191778a4f92bc82456205a444d522843a630
diff --cc drivers/pci/host/Kconfig
index 21df477be0c8,f9492cc90ccd,88f4862fa452,21df477be0c8..4b3193f07336
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@@@@ -1,9 -1,18 -1,9 -1,9 +1,18 @@@@@
    menu "PCI host controller drivers"
    	depends on PCI
    
+ ++config PCI_DRA7XX
+ ++	bool "TI DRA7xx PCIe controller"
+ ++	select PCIE_DW
+ ++	depends on OF && HAS_IOMEM && TI_PIPE3
+ ++	help
+ ++	 Enables support for the PCIe controller in the DRA7xx SoC.  There
+ ++	 are two instances of PCIe controller in DRA7xx.  This controller can
+ ++	 act both as EP and RC.  This reuses the Designware core.
+ ++
    config PCI_MVEBU
    	bool "Marvell EBU PCIe controller"
-- -	depends on ARCH_MVEBU || ARCH_DOVE || ARCH_KIRKWOOD
++ +	depends on ARCH_MVEBU || ARCH_DOVE
    	depends on OF
    
    config PCIE_DW