aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2016-02-09 12:54:03 -0600
committerBjorn Helgaas <bhelgaas@google.com>2016-02-09 12:54:03 -0600
commita314966fad613dbe644066d34eee9edc8afd6258 (patch)
tree20cc9cea6568f845bf08bef26dd6219d8f8d4c22 /arch
parentMerge branches 'pci/aer', 'pci/misc' and 'pci/virtualization' into next (diff)
parentPCI: designware: Remove PCI_PROBE_ONLY handling (diff)
parentPCI: imx6: Move link up check into imx6_pcie_wait_for_link() (diff)
parentPCI: layerscape: Add "fsl,ls2085a-pcie" compatible ID (diff)
parentPCI: rcar: Remove PCI_PROBE_ONLY handling (diff)
downloadlinux-dev-a314966fad613dbe644066d34eee9edc8afd6258.tar.xz
linux-dev-a314966fad613dbe644066d34eee9edc8afd6258.zip
Merge branches 'pci/host-designware', 'pci/host-imx6', 'pci/host-layerscape' and 'pci/host-rcar' into next
* pci/host-designware: PCI: designware: Remove PCI_PROBE_ONLY handling PCI: designware: Explain why we don't program ATU for some platforms * pci/host-imx6: PCI: imx6: Move link up check into imx6_pcie_wait_for_link() PCI: imx6: Remove broken Gen2 workaround PCI: imx6: Move PHY reset into imx6_pcie_establish_link() PCI: imx6: Move imx6_pcie_reset_phy() near other PHY handling functions * pci/host-layerscape: PCI: layerscape: Add "fsl,ls2085a-pcie" compatible ID * pci/host-rcar: PCI: rcar: Remove PCI_PROBE_ONLY handling