]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'pci/host-designware', 'pci/host-imx6', 'pci/host-layerscape' and...
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 9 Feb 2016 18:54:03 +0000 (12:54 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 9 Feb 2016 18:54:03 +0000 (12:54 -0600)
commit6c4eacda99ab400c5296e35f40cd7bf2de3784a4
tree20cc9cea6568f845bf08bef26dd6219d8f8d4c22
parent0e27a7dc585a270dab8b153dbbedfd208a740013
parent93ac16ebb2075e0391ed079275bf7d4ce58714f3
parentfbb8272326715f8c49d09d89cf324f9eabd3eb08
parent1e666f49d0626d9bd0f88a68d05abc2a66130c2e
parenta29f29e0d8c2371be44ac2ccd184600083e25698
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