From: Tom Joseph <tjoseph@cadence.com>
To: <linux-pci@vger.kernel.org>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Bjorn Helgaas <bhelgaas@google.com>,
<linux-kernel@vger.kernel.org>, Tom Joseph <tjoseph@cadence.com>
Subject: [PATCH v3 2/2] PCI: cadence: Create new folder 'cadence' and move all cadence files to it
Date: Tue, 29 Oct 2019 11:45:12 +0000 [thread overview]
Message-ID: <1572349512-7776-3-git-send-email-tjoseph@cadence.com> (raw)
In-Reply-To: <1572349512-7776-1-git-send-email-tjoseph@cadence.com>
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>
---
drivers/pci/controller/Kconfig | 44 +--------------------
drivers/pci/controller/Makefile | 5 +--
drivers/pci/controller/cadence/Kconfig | 45 ++++++++++++++++++++++
drivers/pci/controller/cadence/Makefile | 5 +++
.../pci/controller/{ => cadence}/pcie-cadence-ep.c | 0
.../controller/{ => cadence}/pcie-cadence-host.c | 0
.../controller/{ => cadence}/pcie-cadence-plat.c | 0
.../pci/controller/{ => cadence}/pcie-cadence.c | 0
.../pci/controller/{ => cadence}/pcie-cadence.h | 0
9 files changed, 52 insertions(+), 47 deletions(-)
create mode 100644 drivers/pci/controller/cadence/Kconfig
create mode 100644 drivers/pci/controller/cadence/Makefile
rename drivers/pci/controller/{ => cadence}/pcie-cadence-ep.c (100%)
rename drivers/pci/controller/{ => cadence}/pcie-cadence-host.c (100%)
rename drivers/pci/controller/{ => cadence}/pcie-cadence-plat.c (100%)
rename drivers/pci/controller/{ => cadence}/pcie-cadence.c (100%)
rename drivers/pci/controller/{ => cadence}/pcie-cadence.h (100%)
diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig
index 57d52f6..2aab586 100644
--- 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
@@ -297,4 +254,5 @@ config VMD
module will be called vmd.
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 676a41e..8a59829 100644
--- 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_MVEBU) += pci-mvebu.o
diff --git a/drivers/pci/controller/cadence/Kconfig b/drivers/pci/controller/cadence/Kconfig
new file mode 100644
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
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
--
2.2.2
next prev parent reply other threads:[~2019-10-29 11:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-29 11:45 [PATCH v3 0/2]PCI: cadence: Convert drivers to core library Tom Joseph
2019-10-29 11:45 ` [PATCH v3 1/2] PCI: cadence: Refactor driver to use as a " Tom Joseph
2019-11-01 14:00 ` Andrew Murray
2019-12-05 11:24 ` Kishon Vijay Abraham I
2019-10-29 11:45 ` Tom Joseph [this message]
2019-11-01 14:12 ` [PATCH v3 2/2] PCI: cadence: Create new folder 'cadence' and move all cadence files to it Andrew Murray
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1572349512-7776-3-git-send-email-tjoseph@cadence.com \
--to=tjoseph@cadence.com \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).