diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2016-03-15 08:55:19 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-03-15 08:55:19 -0500 |
commit | c334f9c89e40d2c9f4598e87e186bf3264d39e51 (patch) | |
tree | 5025b96d8bea94f3a83051db974768e4948ea833 | |
parent | 18e5e6913b1ae5c6f60390945d4c8446f5c40c89 (diff) | |
parent | eff31f4002c4e25b9b8c39d0a3a551c6c64c77e8 (diff) | |
parent | 28e3abe591e22717f7fabb9ffa839571b85df323 (diff) | |
parent | 25de15c958e98747c7dada3983474bd4b8ae381b (diff) | |
parent | 304e6d572bf2dc810b806254123f7412dba334fa (diff) | |
parent | e32faa303f7f63bad8f9f04267878d61e0f7e0b5 (diff) | |
parent | 7b6e7ba8e81a862e20d213d90aa5ba1e5a02aba6 (diff) | |
parent | 2c2c5c5cd213aea38c850bb6edc9b7f77f29802f (diff) | |
parent | 01cf9d524ff06703dbed37014f34dba9c1b2434d (diff) | |
parent | ab597d35ef11d2a921e0ec507a9b7861bcb44cbd (diff) | |
download | blackbird-op-linux-c334f9c89e40d2c9f4598e87e186bf3264d39e51.tar.gz blackbird-op-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