From: Bjorn Helgaas Date: Wed, 15 Aug 2018 19:59:10 +0000 (-0500) Subject: Merge branch 'remotes/lorenzo/pci/cadence' X-Git-Tag: microblaze-v5.0-rc1~596^2~6 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=37f0e311bca66e9fe74703887c9bb4965914cabf;p=linux-2.6-microblaze.git Merge branch 'remotes/lorenzo/pci/cadence' - Correct the Cadence cdns_pcie_writel() signature (Alan Douglas) - Add Cadence support for optional generic PHYs (Alan Douglas) - Add Cadence power management ops (Alan Douglas) - Remove redundant variable from Cadence driver (Colin Ian King) * remotes/lorenzo/pci/cadence: PCI: pcie-cadence-ep: Remove redundant variable mmc PCI: cadence: Add shutdown callback to host driver PCI: cadence: Add Power Management ops for host and EP dt-bindings: PCI: cadence: Add DT bindings for optional PHYs PCI: cadence: Add generic PHY support to host and EP drivers PCI: cadence: Update cdns_pcie_writel() function signature --- 37f0e311bca66e9fe74703887c9bb4965914cabf