tree 6a5a6484dc62d084649ed118e4124e29c5485109
parent 608235a30706814dfff5b23938dc5f14fdb7e7e3
parent bc9ef770047a931787e1b1e092dbe3993ce4e0fb
author Bjorn Helgaas <bhelgaas@google.com> 1387568287 -0700
committer Bjorn Helgaas <bhelgaas@google.com> 1387568287 -0700

Merge branch 'pci/host-imx6' into next

* pci/host-imx6:
  PCI: imx6: Fix bugs in PCIe startup code
  PCI: imx6: Start link in Gen1 before negotiating for Gen2 mode
  PCI: imx6: Factor out link up wait loop
  PCI: imx6: Factor out PHY reset
  PCI: imx6: Report "link up" only after link training completes
  PCI: imx6: Make reset-gpio optional