PCI: cadence: Move all files to per-device cadence directory

Cadence core library files may be used by various platform drivers.
Add a new directory "cadence" to group all the Cadence core library files
and the platforms using Cadence core library.

Signed-off-by: Tom Joseph <tjoseph@cadence.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Andrew Murray <andrew.murray@arm.com>

diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig
index b593616e9f52d7226465b37478ae03fb2a0c6a44..5da00343bce7d673d3e7892f378b918ed825cafc 100644 (file)
--- a/drivers/pci/controller/Kconfig
+++ b/drivers/pci/controller/Kconfig
@@ -22,49 +22,6 @@ config PCI_AARDVARK
         controller is part of the South Bridge of the Marvel Armada
         3700 SoC.
 
-menu "Cadence PCIe controllers support"
-
-config PCIE_CADENCE
-       bool
-
-config PCIE_CADENCE_HOST
-       bool
-       depends on OF
-       select IRQ_DOMAIN
-       select PCIE_CADENCE
-
-config PCIE_CADENCE_EP
-       bool
-       depends on OF
-       depends on PCI_ENDPOINT
-       select PCIE_CADENCE
-
-config PCIE_CADENCE_PLAT
-       bool
-
-config PCIE_CADENCE_PLAT_HOST
-       bool "Cadence PCIe platform host controller"
-       depends on OF
-       select PCIE_CADENCE_HOST
-       select PCIE_CADENCE_PLAT
-       help
-         Say Y here if you want to support the Cadence PCIe platform controller in
-         host mode. This PCIe controller may be embedded into many different
-         vendors SoCs.
-
-config PCIE_CADENCE_PLAT_EP
-       bool "Cadence PCIe platform endpoint controller"
-       depends on OF
-       depends on PCI_ENDPOINT
-       select PCIE_CADENCE_EP
-       select PCIE_CADENCE_PLAT
-       help
-         Say Y here if you want to support the Cadence PCIe  platform controller in
-         endpoint mode. This PCIe controller may be embedded into many
-         different vendors SoCs.
-
-endmenu
-
 config PCIE_XILINX_NWL
        bool "NWL PCIe Core"
        depends on ARCH_ZYNQMP || COMPILE_TEST
@@ -304,4 +261,5 @@ config PCI_HYPERV_INTERFACE
          have a common interface with the Hyper-V PCI frontend driver.
 
 source "drivers/pci/controller/dwc/Kconfig"
+source "drivers/pci/controller/cadence/Kconfig"
 endmenu

diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile
index 42a6363d38f1b091f63a0390d171b6d0f9eb2768..3d4f597f15ce2774a812177801acfd13b18d0d5c 100644 (file)
--- a/drivers/pci/controller/Makefile
+++ b/drivers/pci/controller/Makefile
@@ -1,8 +1,5 @@
 # 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
-obj-$(CONFIG_PCIE_CADENCE_PLAT) += pcie-cadence-plat.o
+obj-$(CONFIG_PCIE_CADENCE) += cadence/
 obj-$(CONFIG_PCI_FTPCI100) += pci-ftpci100.o
 obj-$(CONFIG_PCI_HYPERV) += pci-hyperv.o
 obj-$(CONFIG_PCI_HYPERV_INTERFACE) += pci-hyperv-intf.o

diff --git a/drivers/pci/controller/cadence/Kconfig b/drivers/pci/controller/cadence/Kconfig
new file mode 100644 (file)
index 0000000..b76b3cf
--- /dev/null
+++ b/drivers/pci/controller/cadence/Kconfig
@@ -0,0 +1,45 @@
+# SPDX-License-Identifier: GPL-2.0
+
+menu "Cadence PCIe controllers support"
+       depends on PCI
+
+config PCIE_CADENCE
+       bool
+
+config PCIE_CADENCE_HOST
+       bool
+       depends on OF
+       select IRQ_DOMAIN
+       select PCIE_CADENCE
+
+config PCIE_CADENCE_EP
+       bool
+       depends on OF
+       depends on PCI_ENDPOINT
+       select PCIE_CADENCE
+
+config PCIE_CADENCE_PLAT
+       bool
+
+config PCIE_CADENCE_PLAT_HOST
+       bool "Cadence PCIe platform host controller"
+       depends on OF
+       select PCIE_CADENCE_HOST
+       select PCIE_CADENCE_PLAT
+       help
+         Say Y here if you want to support the Cadence PCIe platform controller in
+         host mode. This PCIe controller may be embedded into many different
+         vendors SoCs.
+
+config PCIE_CADENCE_PLAT_EP
+       bool "Cadence PCIe platform endpoint controller"
+       depends on OF
+       depends on PCI_ENDPOINT
+       select PCIE_CADENCE_EP
+       select PCIE_CADENCE_PLAT
+       help
+         Say Y here if you want to support the Cadence PCIe  platform controller in
+         endpoint mode. This PCIe controller may be embedded into many
+         different vendors SoCs.
+
+endmenu

diff --git a/drivers/pci/controller/cadence/Makefile b/drivers/pci/controller/cadence/Makefile
new file mode 100644 (file)
index 0000000..232a3f2
--- /dev/null
+++ b/drivers/pci/controller/cadence/Makefile
@@ -0,0 +1,5 @@
+# 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
+obj-$(CONFIG_PCIE_CADENCE_PLAT) += pcie-cadence-plat.o

diff --git a/drivers/pci/controller/pcie-cadence-ep.c b/drivers/pci/controller/cadence/pcie-cadence-ep.c
similarity index 100%
rename from drivers/pci/controller/pcie-cadence-ep.c
rename to drivers/pci/controller/cadence/pcie-cadence-ep.c

diff --git a/drivers/pci/controller/pcie-cadence-host.c b/drivers/pci/controller/cadence/pcie-cadence-host.c
similarity index 100%
rename from drivers/pci/controller/pcie-cadence-host.c
rename to drivers/pci/controller/cadence/pcie-cadence-host.c

diff --git a/drivers/pci/controller/pcie-cadence-plat.c b/drivers/pci/controller/cadence/pcie-cadence-plat.c
similarity index 100%
rename from drivers/pci/controller/pcie-cadence-plat.c
rename to drivers/pci/controller/cadence/pcie-cadence-plat.c

diff --git a/drivers/pci/controller/pcie-cadence.c b/drivers/pci/controller/cadence/pcie-cadence.c
similarity index 100%
rename from drivers/pci/controller/pcie-cadence.c
rename to drivers/pci/controller/cadence/pcie-cadence.c

diff --git a/drivers/pci/controller/pcie-cadence.h b/drivers/pci/controller/cadence/pcie-cadence.h
similarity index 100%
rename from drivers/pci/controller/pcie-cadence.h
rename to drivers/pci/controller/cadence/pcie-cadence.h