From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 4 Jun 2020 17:59:18 +0000 (-0500)
Subject: Merge branch 'remotes/lorenzo/pci/rcar'
X-Git-Tag: v5.8-rc1~115^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=51755de7398c596abbce6890ca6c62525f87d981;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'remotes/lorenzo/pci/rcar'

  - Fix rcar OB window programming (Andrew Murray)

  - Add rcar suspend/resume support (Kazufumi Ikeda)

  - Add r8a77961 to DT binding (Yoshihiro Shimoda)

  - Rename pcie-rcar.c to pcie-rcar-host.c to make room for endpoint mode
    (Lad Prabhakar)

  - Move shareable code to pcie-rcar.c (Lad Prabhakar)

  - Correct PCIEPAMR mask calculation for "size < 128" (Lad Prabhakar)

  - Add endpoint support for multiple outbound memory windows (Lad
    Prabhakar)

  - Add R-Car PCIe endpoint driver and DT bindings (Lad Prabhakar)

* remotes/lorenzo/pci/rcar:
  MAINTAINERS: Add file patterns for rcar PCI device tree bindings
  PCI: rcar: Add endpoint mode support
  dt-bindings: PCI: rcar: Add bindings for R-Car PCIe endpoint controller
  PCI: endpoint: Add support to handle multiple base for mapping outbound memory
  PCI: endpoint: Pass page size as argument to pci_epc_mem_init()
  PCI: rcar: Fix calculating mask for PCIEPAMR register
  PCI: rcar: Move shareable code to a common file
  PCI: rcar: Rename pcie-rcar.c to pcie-rcar-host.c
  dt-bindings: pci: rcar: add r8a77961 support
  PCI: rcar: Add suspend/resume
  PCI: rcar: Fix incorrect programming of OB windows
---

51755de7398c596abbce6890ca6c62525f87d981
diff --cc drivers/pci/controller/Kconfig
index 416a534147282,0b2c198b865f2..02cc41c50469f
--- a/drivers/pci/controller/Kconfig
+++ b/drivers/pci/controller/Kconfig
@@@ -58,11 -58,29 +58,29 @@@ config PCIE_RCA
  	bool "Renesas R-Car PCIe controller"
  	depends on ARCH_RENESAS || COMPILE_TEST
  	depends on PCI_MSI_IRQ_DOMAIN
+ 	select PCIE_RCAR_HOST
  	help
  	  Say Y here if you want PCIe controller support on R-Car SoCs.
+ 	  This option will be removed after arm64 defconfig is updated.
+ 
+ config PCIE_RCAR_HOST
+ 	bool "Renesas R-Car PCIe host controller"
+ 	depends on ARCH_RENESAS || COMPILE_TEST
+ 	depends on PCI_MSI_IRQ_DOMAIN
+ 	help
+ 	  Say Y here if you want PCIe controller support on R-Car SoCs in host
+ 	  mode.
+ 
+ config PCIE_RCAR_EP
+ 	bool "Renesas R-Car PCIe endpoint controller"
+ 	depends on ARCH_RENESAS || COMPILE_TEST
+ 	depends on PCI_ENDPOINT
+ 	help
+ 	  Say Y here if you want PCIe controller support on R-Car SoCs in
+ 	  endpoint mode.
  
  config PCI_HOST_COMMON
 -	bool
 +	tristate
  	select PCI_ECAM
  
  config PCI_HOST_GENERIC