From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 4 Jul 2017 16:00:59 +0000 (-0500)
Subject: Merge branch 'pci/host-rockchip' into next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=01a9259bc554f1e450016f36bdb832328a17257b;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'pci/host-rockchip' into next

* pci/host-rockchip:
  PCI: rockchip: Use normal register bank for config accessors
  PCI: rockchip: Use local struct device pointer consistently
  PCI: rockchip: Check for clk_prepare_enable() errors during resume
  MAINTAINERS: Remove Wenrui Li as Rockchip PCIe driver maintainer
  PCI: rockchip: Configure RC's MPS setting
  PCI: rockchip: Reconfigure configuration space header type
  PCI: rockchip: Split out rockchip_pcie_cfg_configuration_accesses()
  PCI: rockchip: Move configuration accesses into rockchip_pcie_cfg_atu()
  PCI: rockchip: Rename rockchip_cfg_atu() to rockchip_pcie_cfg_atu()
  PCI: rockchip: Control vpcie0v9 for system PM
---

01a9259bc554f1e450016f36bdb832328a17257b
diff --cc MAINTAINERS
index ed26c0b2eeb5,380be96dc062..82b19f5ae5ad
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -9933,17 -9933,8 +9933,16 @@@ S:	Maintaine
  F:	Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
  F:	drivers/pci/dwc/pcie-hisi.c
  
 +PCIE DRIVER FOR HISILICON KIRIN
 +M:	Xiaowei Song <songxiaowei@hisilicon.com>
 +M:	Binghui Wang <wangbinghui@hisilicon.com>
 +L:	linux-pci@vger.kernel.org
 +S:	Maintained
 +F:	Documentation/devicetree/bindings/pci/pcie-kirin.txt
 +F:	drivers/pci/dwc/pcie-kirin.c
 +
  PCIE DRIVER FOR ROCKCHIP
  M:	Shawn Lin <shawn.lin@rock-chips.com>
- M:	Wenrui Li <wenrui.li@rock-chips.com>
  L:	linux-pci@vger.kernel.org
  L:	linux-rockchip@lists.infradead.org
  S:	Maintained