Merge branches 'pci/host-designware', 'pci/host-imx6', 'pci/host-layerscape' and 'pci/host-rcar' into next

Browse source

* 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

...

This commit is contained in:

Bjorn Helgaas 2016-02-09 12:54:03 -06:00

parent 129aaabc84 ed00c83cd4 4d107d3b5a dbae40b76a 3487c65659

commit a314966fad

4 changed files with 69 additions and 98 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

137

drivers/pci/host/pci-imx6.c

View file

1

drivers/pci/host/pci-layerscape.c

View file

15

drivers/pci/host/pcie-designware.c

View file

14

drivers/pci/host/pcie-rcar.c

View file