From: Bjorn Helgaas Date: Fri, 5 Sep 2014 16:57:20 +0000 (-0600) Subject: Merge branches 'pci/misc', 'pci/pm', 'pci/host-designware', 'pci/host-imx6', 'pci... X-Git-Tag: firefly_0821_release~176^2~3101^2~14 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a2351efeb3b4e11a97117e048027a9d09855d309;p=firefly-linux-kernel-4.4.55.git Merge branches 'pci/misc', 'pci/pm', 'pci/host-designware', 'pci/host-imx6', 'pci/host-keystone', 'pci/host-tegra' and 'pci/host-xilinx' into next * pci/misc: PCI/AER: Make standalone includable PCI: Remove unnecessary variable in pci_add_dynid() * pci/pm: PCI/PM: Allow PCI devices to be put into D3cold during system suspend PCI/PM: Drop unused runtime PM support code for PCIe ports * pci/host-designware: PCI: designware: Check private_data validity in single place PCI: designware: Remove pci_assign_unassigned_resources() from dw_pcie_host_init() PCI: designware: Use pci_create_root_bus() instead of pci_scan_root_bus() PCI: designware: Parse bus-range property from devicetree PCI: designware: Add support for v3.65 hardware * pci/host-imx6: PCI: imx6: Probe in module_init(), not fs_initcall() PCI: designware: Remove pci_assign_unassigned_resources() from dw_pcie_host_init() PCI: designware: Use pci_create_root_bus() instead of pci_scan_root_bus() PCI: designware: Parse bus-range property from devicetree PCI: imx6: Put LTSSM in "Detect" state before disabling it MAINTAINERS: Add Lucas Stach as co-maintainer for i.MX6 PCI driver PCI: designware: Add support for v3.65 hardware * pci/host-keystone: PCI: keystone: Add TI Keystone PCIe driver PCI: designware: Add support for v3.65 hardware * pci/host-tegra: PCI: tegra: Implement a proper resource hierarchy PCI: tegra: Add missing cleanup in error path and tegra_msi_teardown_irq() resources: Add device-managed request/release_resource() * pci/host-xilinx: PCI: xilinx: Add Xilinx AXI PCIe Host Bridge IP driver Conflicts: drivers/pci/host/Kconfig drivers/pci/host/Makefile --- a2351efeb3b4e11a97117e048027a9d09855d309 diff --cc drivers/pci/host/Kconfig index 8922c376456a,8922c376456a,8922c376456a,8922c376456a,8922c376456a,3fe8bf627f70,8922c376456a,26bbaa5907e3..34134d64f35a --- a/drivers/pci/host/Kconfig +++ b/drivers/pci/host/Kconfig @@@@@@@@@ -63,4 -63,4 -63,4 -63,4 -63,4 -63,14 -63,4 -63,11 +63,23 @@@@@@@@@ config PCIE_SPEAR13X help Say Y here if you want PCIe support on SPEAr13XX SoCs. ++++++++ +++++ ++config PCI_KEYSTONE +++++ ++ bool "TI Keystone PCIe controller" +++++ ++ depends on ARCH_KEYSTONE +++++ ++ select PCIE_DW +++++ ++ select PCIEPORTBUS +++++ ++ help +++++ ++ Say Y here if you want to enable PCI controller support on Keystone +++++ ++ SoCs. The PCI controller on Keystone is based on Designware hardware +++++ ++ and therefore the driver re-uses the Designware core functions to +++++ ++ implement the driver. ++++++++ +++++++ config PCIE_XILINX +++++++ bool "Xilinx AXI PCIe host bridge support" +++++++ depends on ARCH_ZYNQ +++++++ help +++++++ Say 'Y' here if you want kernel to support the Xilinx AXI PCIe +++++++ Host Bridge driver. +++++++ endmenu diff --cc drivers/pci/host/Makefile index d0e88f114ff9,d0e88f114ff9,d0e88f114ff9,d0e88f114ff9,d0e88f114ff9,057ea60f5cdd,d0e88f114ff9,0677495d40f5..182929cdbcd9 --- a/drivers/pci/host/Makefile +++ b/drivers/pci/host/Makefile @@@@@@@@@ -8,3 -8,3 -8,3 -8,3 -8,3 -8,4 -8,3 -8,4 +8,5 @@@@@@@@@ obj-$(CONFIG_PCI_RCAR_GEN2) += pci-rcar obj-$(CONFIG_PCI_RCAR_GEN2_PCIE) += pcie-rcar.o obj-$(CONFIG_PCI_HOST_GENERIC) += pci-host-generic.o obj-$(CONFIG_PCIE_SPEAR13XX) += pcie-spear13xx.o +++++ ++obj-$(CONFIG_PCI_KEYSTONE) += pci-keystone-dw.o pci-keystone.o +++++++ obj-$(CONFIG_PCIE_XILINX) += pcie-xilinx.o