diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2018-08-15 14:59:10 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-08-15 14:59:10 -0500 |
commit | 37f0e311bca66e9fe74703887c9bb4965914cabf (patch) | |
tree | 3be9f14dc28fe04e9823cc12d4bc11c9cf2a6af8 /block/blk-settings.c | |
parent | ce342a1aa8c61fe3315b782f6cf4f34d5babce13 (diff) | |
parent | eb1e39f784e83321353314da1b2e8cbb2fceaba9 (diff) | |
download | linux-37f0e311bca66e9fe74703887c9bb4965914cabf.tar.bz2 |
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
Diffstat (limited to 'block/blk-settings.c')
0 files changed, 0 insertions, 0 deletions