From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 15 Dec 2020 21:11:10 +0000 (-0600)
Subject: Merge branch 'pci/ecam'
X-Git-Tag: v5.11-rc1~149^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c250f8293a362189419ae8b34da111ba02af304;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pci/ecam'

- Unify ECAM constants in native PCI Express drivers (Krzysztof Wilczyński)

- Add thunder-pem constant for custom ".bus_shift" initialiser (Krzysztof
  Wilczyński)

- Convert iproc to use new ECAM constants (Krzysztof Wilczyński)

- Change vmd __iomem pointers from "char *" to "void *" (Krzysztof
  Wilczyński)

- Remove unused xgene .bus_shift initialisers (Krzysztof Wilczyński)

* pci/ecam:
  PCI: xgene: Removed unused ".bus_shift" initialisers from pci-xgene.c
  PCI: vmd: Update type of the __iomem pointers
  PCI: iproc: Convert to use the new ECAM constants
  PCI: thunder-pem: Add constant for custom ".bus_shift" initialiser
  PCI: Unify ECAM constants in native PCI Express drivers
---

7c250f8293a362189419ae8b34da111ba02af304