From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 28 Nov 2019 14:54:48 +0000 (-0600)
Subject: Merge branch 'remotes/lorenzo/pci/rcar'
X-Git-Tag: v5.5-rc1~55^2~7
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=21cea0c0eabae5d8b498b661885396d7186f6b61;p=linux-block.git

Merge branch 'remotes/lorenzo/pci/rcar'

  - Clear bit 0 of MACCTLR before PCIETCTLR.CFINIT per manual (Yoshihiro
    Shimoda)

  - Remove unnecessary header include from rcar (Andrew Murray)

  - Tighten register index checking for rcar inbound range programming
    (Marek Vasut)

  - Fix rcar inbound range alignment calculation to improve packing of
    multiple entries (Marek Vasut)

  - Update rcar MACCTLR setting to match documentation (Yoshihiro Shimoda)

* remotes/lorenzo/pci/rcar:
  PCI: rcar: Fix missing MACCTLR register setting in initialization sequence
  PCI: rcar: Recalculate inbound range alignment for each controller entry
  PCI: rcar: Move the inbound index check
  PCI: rcar: Remove unnecessary header include (../pci.h)
---

21cea0c0eabae5d8b498b661885396d7186f6b61