• B
    Merge branches 'pci/misc', 'pci/pm', 'pci/host-designware', 'pci/host-imx6',... · a2351efe
    Bjorn Helgaas 提交于
    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 <linux/aer.h> 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
    a2351efe
Kconfig 2.2 KB