diff options
| author | Bjorn Helgaas | 2016-02-09 12:54:03 -0600 |
|---|---|---|
| committer | Bjorn Helgaas | 2016-02-09 12:54:03 -0600 |
| commit | a314966fad613dbe644066d34eee9edc8afd6258 (patch) | |
| tree | 20cc9cea6568f845bf08bef26dd6219d8f8d4c22 /arch/blackfin | |
| parent | 129aaabc84b2304d8f5f396e845bb66583e30c56 (diff) | |
| parent | ed00c83cd4909dc268cc0639bf16804444ed8c79 (diff) | |
| parent | 4d107d3b5a686b5834e533a00b73bf7b1cf59df7 (diff) | |
| parent | dbae40b76abef2f8a7e7bf1701f77df9e73def48 (diff) | |
| parent | 3487c65659088c8205d8ab726b45469912271bbd (diff) | |
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