summaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci-label.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2016-03-15 14:55:19 +0100
committerBjorn Helgaas <bhelgaas@google.com>2016-03-15 14:55:19 +0100
commitc334f9c89e40d2c9f4598e87e186bf3264d39e51 (patch)
tree5025b96d8bea94f3a83051db974768e4948ea833 /drivers/pci/pci-label.c
parentMerge branches 'pci/aer', 'pci/enumeration', 'pci/kconfig', 'pci/misc', 'pci/... (diff)
parentPCI: altera: Fix altera_pcie_link_is_up() (diff)
parentPCI: imx6: Add DT bindings to configure PHY Tx driver settings (diff)
parentPCI: keystone: Defer probing if devm_phy_get() returns -EPROBE_DEFER (diff)
parentPCI: rcar: Depend on ARCH_RENESAS, not ARCH_SHMOBILE (diff)
parentPCI: tegra: Remove misleading PHYS_OFFSET (diff)
parentPCI: thunder: Add driver for ThunderX-pass{1,2} on-chip devices (diff)
parentx86/PCI: VMD: Attach VMD resources to parent domain's resource tree (diff)
parentmicroblaze/PCI: Support generic Xilinx AXI PCIe Host Bridge IP driver (diff)
parentPCI: xilinx-nwl: Add support for Xilinx NWL PCIe Host Controller (diff)
downloadlinux-c334f9c89e40d2c9f4598e87e186bf3264d39e51.tar.xz
linux-c334f9c89e40d2c9f4598e87e186bf3264d39e51.zip
Merge branches 'pci/host-altera', 'pci/host-imx6', 'pci/host-keystone', 'pci/host-rcar', 'pci/host-tegra', 'pci/host-thunder', 'pci/host-vmd', 'pci/host-xilinx' and 'pci/host-xilinx-nwl' into next
* pci/host-altera: PCI: altera: Fix altera_pcie_link_is_up() * pci/host-imx6: PCI: imx6: Add DT bindings to configure PHY Tx driver settings * pci/host-keystone: PCI: keystone: Defer probing if devm_phy_get() returns -EPROBE_DEFER * pci/host-rcar: PCI: rcar: Depend on ARCH_RENESAS, not ARCH_SHMOBILE * pci/host-tegra: PCI: tegra: Remove misleading PHYS_OFFSET PCI: tegra: Track bus -> CPU mapping PCI: tegra: Remove unused struct tegra_pcie.num_ports field PCI: tegra: Implement ->{add,remove}_bus() callbacks PCI: Add pci_ops.{add,remove}_bus() callbacks * pci/host-thunder: PCI: thunder: Add driver for ThunderX-pass{1,2} on-chip devices PCI: thunder: Add PCIe host driver for ThunderX processors PCI: generic: Expose pci_host_common_probe() for use by other drivers PCI: generic: Add pci_host_common_probe(), based on gen_pci_probe() PCI: generic: Move structure definitions to separate header file * pci/host-vmd: x86/PCI: VMD: Attach VMD resources to parent domain's resource tree x86/PCI: VMD: Set bus resource start to 0 x86/PCI: VMD: Document code for maintainability * pci/host-xilinx: microblaze/PCI: Support generic Xilinx AXI PCIe Host Bridge IP driver PCI: xilinx: Update Zynq binding with Microblaze node PCI: xilinx: Don't call pci_fixup_irqs() on Microblaze PCI: xilinx: Remove dependency on ARM-specific struct hw_pci PCI: xilinx: Use of_pci_get_host_bridge_resources() to parse DT * pci/host-xilinx-nwl: PCI: xilinx-nwl: Add support for Xilinx NWL PCIe Host Controller