diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-06-06 16:10:41 -0500 | 
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-06-06 16:10:41 -0500 | 
| commit | 1c2bef0a3fd14287a66edd7ead57fd2e439485a2 (patch) | |
| tree | 7c485b2a37ce06dc8226d0e1e00f8501eb093169 /net/unix/diag.c | |
| parent | 4c31ff0b3a5fe1f0012479f1c8eb3df0464e7742 (diff) | |
| parent | 0bbf6b9230df602616a6c6f5861e8964e9162f4a (diff) | |
Merge branch 'lorenzo/pci/rcar'
  - clean up clocks, MSI, IRQ mappings in R-Car probe failure paths (Marek
    Vasut)
  - poll more frequently (5us vs 5ms) while waiting for R-Car data link
    active (Marek Vasut)
  - use generic OF parsing interface in R-Car (Vladimir Zapolskiy)
  - add R-Car V3H (R8A77980) "compatible" string (Sergei Shtylyov)
  - add R-Car gen3 PHY support (Sergei Shtylyov)
  - improve R-Car PHYRDY polling (Sergei Shtylyov)
  - clean up R-Car macros (Marek Vasut)
  - use runtime PM for R-Car controller clock (Dien Pham)
* lorenzo/pci/rcar:
  PCI: rcar: Remove IRQ mappings in rcar_pcie_enable_msi() failpath
  PCI: rcar: Teardown MSI setup if rcar_pcie_enable() fails
  PCI: rcar: Add missing irq_dispose_mapping() into failpath
  PCI: rcar: Pull bus clock enable/disable from rcar_pcie_get_resources()
  PCI: rcar: Poll more often in rcar_pcie_wait_for_dl()
  PCI: rcar: Reuse generic pci_parse_request_of_pci_ranges() function
  DT: pci: rcar-pci: document R8A77980 bindings
  PCI: rcar: Factor out rcar_pcie_hw_init() call
  PCI: rcar: Add R-Car gen3 PHY support
  PCI: rcar: Remove PHYRDY polling from rcar_pcie_hw_init_h1()
  PCI: rcar: Poll PHYRDY in rcar_pcie_hw_init()
  PCI: rcar: Clean up the macros
  PCI: rcar: Use runtime PM to control controller clock
# Conflicts:
#	drivers/pci/host/pcie-rcar.c
Diffstat (limited to 'net/unix/diag.c')
0 files changed, 0 insertions, 0 deletions
