diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2015-06-16 08:19:55 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2015-06-16 08:19:55 -0500 |
commit | bf933dbb84453c502355743828a37ead5e82aa68 (patch) | |
tree | 4de60147f7affc0b8f65a9e2c2b64529f0d44cc5 /arch | |
parent | 0ff9b9bad66730e8347cb3350c8d3d1b88a21f13 (diff) | |
parent | 2d91b491d5be13602a73be789bb8a3c28d06b7f2 (diff) | |
parent | 6cbb247e85eb4449d31a8dcb9b3f0464772b1395 (diff) | |
parent | 5dbb4c6167229c8d4f528e8ec26699a7305000a3 (diff) | |
parent | 2393f79cf92ed3bfaf1a6982a18bae4d289aeda8 (diff) | |
parent | ef07991a95de76b07594448c3521361831ec2cfe (diff) | |
parent | e1e6e5c4de24cee3b1bdde52661a8c493351d3cb (diff) | |
download | linux-stable-bf933dbb84453c502355743828a37ead5e82aa68.tar.gz linux-stable-bf933dbb84453c502355743828a37ead5e82aa68.tar.bz2 linux-stable-bf933dbb84453c502355743828a37ead5e82aa68.zip |
Merge branches 'pci/host-designware', 'pci/host-designware-common', 'pci/host-generic', 'pci/host-imx6', 'pci/host-iproc' and 'pci/host-xgene' into next
* pci/host-designware:
PCI: designware: Use iATU0 for cfg and IO, iATU1 for MEM
PCI: designware: Consolidate outbound iATU programming functions
PCI: designware: Add support for x8 links
* pci/host-designware-common:
PCI: designware: Wait for link to come up with consistent style
PCI: layerscape: Factor out ls_pcie_establish_link()
PCI: layerscape: Use dw_pcie_link_up() consistently
PCI: dra7xx: Use dw_pcie_link_up() consistently
PCI: imx6: Rename imx6_pcie_start_link() to imx6_pcie_establish_link()
* pci/host-generic:
of/pci: Fix pci_address_to_pio() conversion of CPU address to I/O port
* pci/host-imx6:
PCI: imx6: Add #define PCIE_RC_LCSR
PCI: imx6: Use "u32", not "uint32_t"
PCI: imx6: Add speed change timeout message
* pci/host-iproc:
PCI: iproc: Free resource list after registration
PCI: iproc: Directly add PCI resources
PCI: iproc: Add BCMA PCIe driver
PCI: iproc: Allow override of device tree IRQ mapping function
* pci/host-xgene:
arm64: dts: Add APM X-Gene PCIe MSI nodes
PCI: xgene: Add APM X-Gene v1 PCIe MSI/MSIX termination driver