Commit 6e0832fa authored by Shawn Lin's avatar Shawn Lin Committed by Bjorn Helgaas
Browse files

PCI: Collect all native drivers under drivers/pci/controller/ 

Native PCI drivers for root complex devices were originally all in
drivers/pci/host/.  Some of these devices can also be operated in endpoint
mode.  Drivers for endpoint mode didn't seem to fit in the "host"
directory, so we put both the root complex and endpoint drivers in
per-device directories, e.g., drivers/pci/dwc/, drivers/pci/cadence/, etc.

These per-device directories contain trivial Kconfig and Makefiles and
clutter drivers/pci/.  Make a new drivers/pci/controllers/ directory and
collect all the device-specific drivers there.

No functional change intended.

Link: https://lkml.kernel.org/r/1520304202-232891-1-git-send-email-shawn.lin@rock-chips.com


Signed-off-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
[bhelgaas: changelog]
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 3a3869f1

MAINTAINERS

+34 −36
Original line number Diff line number Diff line
@@ -6607,7 +6607,7 @@ F: arch/x86/hyperv 
F:	drivers/hid/hid-hyperv.c

F:	drivers/hv/

F:	drivers/input/serio/hyperv-keyboard.c

F:	drivers/pci/host/pci-hyperv.c

F:	drivers/pci/controller/pci-hyperv.c

F:	drivers/net/hyperv/

F:	drivers/scsi/storvsc_drv.c

F:	drivers/uio/uio_hv_generic.c
@@ -9489,7 +9489,7 @@ M: Subrahmanya Lingappa <l.subrahmanya@mobiveil.co.in> 
L:	linux-pci@vger.kernel.org

S:	Supported

F:	Documentation/devicetree/bindings/pci/mobiveil-pcie.txt

F:	drivers/pci/host/pcie-mobiveil.c

F:	drivers/pci/controller/pcie-mobiveil.c



MODULE SUPPORT

M:	Jessica Yu <jeyu@kernel.org>
@@ -10791,7 +10791,7 @@ L: linux-pci@vger.kernel.org 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	Documentation/devicetree/bindings/pci/aardvark-pci.txt

F:	drivers/pci/host/pci-aardvark.c

F:	drivers/pci/controller/pci-aardvark.c



PCI DRIVER FOR ALTERA PCIE IP

M:	Ley Foon Tan <lftan@altera.com>
@@ -10799,7 +10799,7 @@ L: rfi@lists.rocketboards.org (moderated for non-subscribers) 
L:	linux-pci@vger.kernel.org

S:	Supported

F:	Documentation/devicetree/bindings/pci/altera-pcie.txt

F:	drivers/pci/host/pcie-altera.c

F:	drivers/pci/controller/pcie-altera.c



PCI DRIVER FOR APPLIEDMICRO XGENE

M:	Tanmay Inamdar <tinamdar@apm.com>
@@ -10807,7 +10807,7 @@ L: linux-pci@vger.kernel.org 
L:	linux-arm-kernel@lists.infradead.org

S:	Maintained

F:	Documentation/devicetree/bindings/pci/xgene-pci.txt

F:	drivers/pci/host/pci-xgene.c

F:	drivers/pci/controller/pci-xgene.c



PCI DRIVER FOR ARM VERSATILE PLATFORM

M:	Rob Herring <robh@kernel.org>
@@ -10815,7 +10815,7 @@ L: linux-pci@vger.kernel.org 
L:	linux-arm-kernel@lists.infradead.org

S:	Maintained

F:	Documentation/devicetree/bindings/pci/versatile.txt

F:	drivers/pci/host/pci-versatile.c

F:	drivers/pci/controller/pci-versatile.c



PCI DRIVER FOR ARMADA 8K

M:	Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
@@ -10823,14 +10823,14 @@ L: linux-pci@vger.kernel.org 
L:	linux-arm-kernel@lists.infradead.org

S:	Maintained

F:	Documentation/devicetree/bindings/pci/pci-armada8k.txt

F:	drivers/pci/dwc/pcie-armada8k.c

F:	drivers/pci/controller/dwc/pcie-armada8k.c



PCI DRIVER FOR CADENCE PCIE IP

M:	Alan Douglas <adouglas@cadence.com>

L:	linux-pci@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/pci/cdns,*.txt

F:	drivers/pci/cadence/pcie-cadence*

F:	drivers/pci/controller/pcie-cadence*



PCI DRIVER FOR FREESCALE LAYERSCAPE

M:	Minghuan Lian <minghuan.Lian@nxp.com>
@@ -10840,16 +10840,16 @@ L: linuxppc-dev@lists.ozlabs.org 
L:	linux-pci@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org

S:	Maintained

F:	drivers/pci/dwc/*layerscape*

F:	drivers/pci/controller/dwc/*layerscape*



PCI DRIVER FOR GENERIC OF HOSTS

M:	Will Deacon <will.deacon@arm.com>

L:	linux-pci@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	Documentation/devicetree/bindings/pci/host-generic-pci.txt

F:	drivers/pci/host/pci-host-common.c

F:	drivers/pci/host/pci-host-generic.c

F:	Documentation/devicetree/bindings/pci/controller-generic-pci.txt

F:	drivers/pci/controller/pci-host-common.c

F:	drivers/pci/controller/pci-host-generic.c



PCI DRIVER FOR IMX6

M:	Richard Zhu <hongxing.zhu@nxp.com>
@@ -10858,14 +10858,14 @@ L: linux-pci@vger.kernel.org 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt

F:	drivers/pci/dwc/*imx6*

F:	drivers/pci/controller/dwc/*imx6*



PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)

M:	Keith Busch <keith.busch@intel.com>

M:	Jonathan Derrick <jonathan.derrick@intel.com>

L:	linux-pci@vger.kernel.org

S:	Supported

F:	drivers/pci/host/vmd.c

F:	drivers/pci/controller/vmd.c



PCI DRIVER FOR MICROSEMI SWITCHTEC

M:	Kurt Schwemmer <kurt.schwemmer@microsemi.com>
@@ -10885,7 +10885,7 @@ M: Jason Cooper <jason@lakedaemon.net> 
L:	linux-pci@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	drivers/pci/host/*mvebu*

F:	drivers/pci/controller/*mvebu*



PCI DRIVER FOR NVIDIA TEGRA

M:	Thierry Reding <thierry.reding@gmail.com>
@@ -10893,14 +10893,14 @@ L: linux-tegra@vger.kernel.org 
L:	linux-pci@vger.kernel.org

S:	Supported

F:	Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt

F:	drivers/pci/host/pci-tegra.c

F:	drivers/pci/controller/pci-tegra.c



PCI DRIVER FOR RENESAS R-CAR

M:	Simon Horman <horms@verge.net.au>

L:	linux-pci@vger.kernel.org

L:	linux-renesas-soc@vger.kernel.org

S:	Maintained

F:	drivers/pci/host/*rcar*

F:	drivers/pci/controller/*rcar*



PCI DRIVER FOR SAMSUNG EXYNOS

M:	Jingoo Han <jingoohan1@gmail.com>
@@ -10908,7 +10908,7 @@ L: linux-pci@vger.kernel.org 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)

S:	Maintained

F:	drivers/pci/dwc/pci-exynos.c

F:	drivers/pci/controller/dwc/pci-exynos.c



PCI DRIVER FOR SYNOPSYS DESIGNWARE

M:	Jingoo Han <jingoohan1@gmail.com>
@@ -10916,7 +10916,7 @@ M: Joao Pinto <Joao.Pinto@synopsys.com> 
L:	linux-pci@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/pci/designware-pcie.txt

F:	drivers/pci/dwc/*designware*

F:	drivers/pci/controller/dwc/*designware*



PCI DRIVER FOR TI DRA7XX

M:	Kishon Vijay Abraham I <kishon@ti.com>
@@ -10924,14 +10924,14 @@ L: linux-omap@vger.kernel.org 
L:	linux-pci@vger.kernel.org

S:	Supported

F:	Documentation/devicetree/bindings/pci/ti-pci.txt

F:	drivers/pci/dwc/pci-dra7xx.c

F:	drivers/pci/controller/dwc/pci-dra7xx.c



PCI DRIVER FOR TI KEYSTONE

M:	Murali Karicheri <m-karicheri2@ti.com>

L:	linux-pci@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	drivers/pci/dwc/*keystone*

F:	drivers/pci/controller/dwc/*keystone*



PCI ENDPOINT SUBSYSTEM

M:	Kishon Vijay Abraham I <kishon@ti.com>
@@ -10964,7 +10964,7 @@ L: rfi@lists.rocketboards.org (moderated for non-subscribers) 
L:	linux-pci@vger.kernel.org

S:	Supported

F:	Documentation/devicetree/bindings/pci/altera-pcie-msi.txt

F:	drivers/pci/host/pcie-altera-msi.c

F:	drivers/pci/controller/pcie-altera-msi.c



PCI MSI DRIVER FOR APPLIEDMICRO XGENE

M:	Duc Dang <dhdang@apm.com>
@@ -10972,7 +10972,7 @@ L: linux-pci@vger.kernel.org 
L:	linux-arm-kernel@lists.infradead.org

S:	Maintained

F:	Documentation/devicetree/bindings/pci/xgene-pci-msi.txt

F:	drivers/pci/host/pci-xgene-msi.c

F:	drivers/pci/controller/pci-xgene-msi.c



PCI SUBSYSTEM

M:	Bjorn Helgaas <bhelgaas@google.com>
@@ -10998,9 +10998,7 @@ L: linux-pci@vger.kernel.org 
Q:	http://patchwork.ozlabs.org/project/linux-pci/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/

S:	Supported

F:	drivers/pci/cadence/

F:	drivers/pci/host/

F:	drivers/pci/dwc/

F:	drivers/pci/controller/



PCIE DRIVER FOR AXIS ARTPEC

M:	Jesper Nilsson <jesper.nilsson@axis.com>
@@ -11008,7 +11006,7 @@ L: linux-arm-kernel@axis.com 
L:	linux-pci@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/pci/axis,artpec*

F:	drivers/pci/dwc/*artpec*

F:	drivers/pci/controller/dwc/*artpec*



PCIE DRIVER FOR CAVIUM THUNDERX

M:	David Daney <david.daney@cavium.com>
@@ -11016,14 +11014,14 @@ L: linux-pci@vger.kernel.org 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Supported

F:	Documentation/devicetree/bindings/pci/pci-thunder-*

F:	drivers/pci/host/pci-thunder-*

F:	drivers/pci/controller/pci-thunder-*



PCIE DRIVER FOR HISILICON

M:	Zhou Wang <wangzhou1@hisilicon.com>

L:	linux-pci@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/pci/hisilicon-pcie.txt

F:	drivers/pci/dwc/pcie-hisi.c

F:	drivers/pci/controller/dwc/pcie-hisi.c



PCIE DRIVER FOR HISILICON KIRIN

M:	Xiaowei Song <songxiaowei@hisilicon.com>
@@ -11031,7 +11029,7 @@ 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

F:	drivers/pci/controller/dwc/pcie-kirin.c



PCIE DRIVER FOR HISILICON STB

M:	Jianguo Sun <sunjianguo1@huawei.com>
@@ -11039,7 +11037,7 @@ M: Shawn Guo <shawn.guo@linaro.org> 
L:	linux-pci@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt

F:	drivers/pci/dwc/pcie-histb.c

F:	drivers/pci/controller/dwc/pcie-histb.c



PCIE DRIVER FOR MEDIATEK

M:	Ryder Lee <ryder.lee@mediatek.com>
@@ -11047,14 +11045,14 @@ L: linux-pci@vger.kernel.org 
L:	linux-mediatek@lists.infradead.org

S:	Supported

F:	Documentation/devicetree/bindings/pci/mediatek*

F:	drivers/pci/host/*mediatek*

F:	drivers/pci/controller/*mediatek*



PCIE DRIVER FOR QUALCOMM MSM

M:	Stanimir Varbanov <svarbanov@mm-sol.com>

L:	linux-pci@vger.kernel.org

L:	linux-arm-msm@vger.kernel.org

S:	Maintained

F:	drivers/pci/dwc/*qcom*

F:	drivers/pci/controller/dwc/*qcom*



PCIE DRIVER FOR ROCKCHIP

M:	Shawn Lin <shawn.lin@rock-chips.com>
@@ -11062,20 +11060,20 @@ L: linux-pci@vger.kernel.org 
L:	linux-rockchip@lists.infradead.org

S:	Maintained

F:	Documentation/devicetree/bindings/pci/rockchip-pcie*

F:	drivers/pci/host/pcie-rockchip*

F:	drivers/pci/controller/pcie-rockchip*



PCI DRIVER FOR V3 SEMICONDUCTOR V360EPC

M:	Linus Walleij <linus.walleij@linaro.org>

L:	linux-pci@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/pci/v3-v360epc-pci.txt

F:	drivers/pci/host/pci-v3-semi.c

F:	drivers/pci/controller/pci-v3-semi.c



PCIE DRIVER FOR ST SPEAR13XX

M:	Pratyush Anand <pratyush.anand@gmail.com>

L:	linux-pci@vger.kernel.org

S:	Maintained

F:	drivers/pci/dwc/*spear*

F:	drivers/pci/controller/dwc/*spear*



PCMCIA SUBSYSTEM

M:	Dominik Brodowski <linux@dominikbrodowski.net>

drivers/pci/Kconfig

+1 −3
Original line number Diff line number Diff line
@@ -145,8 +145,6 @@ config PCI_HYPERV 
          PCI devices from a PCI backend to support PCI driver domains.



source "drivers/pci/hotplug/Kconfig"

source "drivers/pci/cadence/Kconfig"

source "drivers/pci/dwc/Kconfig"

source "drivers/pci/host/Kconfig"

source "drivers/pci/controller/Kconfig"

source "drivers/pci/endpoint/Kconfig"

source "drivers/pci/switch/Kconfig"

drivers/pci/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -28,14 +28,10 @@ obj-$(CONFIG_PCI_PF_STUB) += pci-pf-stub.o 
obj-$(CONFIG_PCI_ECAM)		+= ecam.o

obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o



obj-y				+= host/

obj-y				+= controller/

obj-y				+= switch/



# Endpoint library must be initialized before its users

obj-$(CONFIG_PCI_ENDPOINT)	+= endpoint/



obj-$(CONFIG_PCIE_CADENCE)	+= cadence/

# pcie-hisi.o quirks are needed even without CONFIG_PCIE_DW

obj-y				+= dwc/



ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG

drivers/pci/cadence/Kconfig

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
menu "Cadence PCIe controllers support"



config PCIE_CADENCE

	bool



config PCIE_CADENCE_HOST

	bool "Cadence PCIe host controller"

	depends on OF

	depends on PCI

	select IRQ_DOMAIN

	select PCIE_CADENCE

	help

	  Say Y here if you want to support the Cadence PCIe controller in host

	  mode. This PCIe controller may be embedded into many different vendors

	  SoCs.



config PCIE_CADENCE_EP

	bool "Cadence PCIe endpoint controller"

	depends on OF

	depends on PCI_ENDPOINT

	select PCIE_CADENCE

	help

	  Say Y here if you want to support the Cadence PCIe  controller in

	  endpoint mode. This PCIe controller may be embedded into many

	  different vendors SoCs.



endmenu

drivers/pci/cadence/Makefile

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_PCIE_CADENCE) += pcie-cadence.o

obj-$(CONFIG_PCIE_CADENCE_HOST) += pcie-cadence-host.o

obj-$(CONFIG_PCIE_CADENCE_EP) += pcie-cadence-ep.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE