Merge branch 'pci/host-imx6' into next
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 28 Apr 2017 15:32:54 +0000 (10:32 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 28 Apr 2017 15:32:54 +0000 (10:32 -0500)
commit7284a62dfd7066919bf9a7318f6dbc7b51a092db
tree70692fb0b0e981e04419f35a389f44702f9c2023
parent4940421013672aafdc8c372c17b5ddf63423c805
parent7221547e55b7929e4d46983f6f3ca15f36ee4dac
Merge branch 'pci/host-imx6' into next

* pci/host-imx6:
  PCI: imx6: Fix spelling mistake: "contol" -> "control"
  PCI: imx6: Do not switch speed if Gen2 is disabled
  PCI: imx6: Do not wait for speed change on i.MX7
  PCI: imx6: Allow probe deferral by reset GPIO
  PCI: imx6: Add code to support i.MX7D