PCI: microchip: Move pcie-microchip-host.c to PLDA directory

Since Microchip PolarFire PCIe host is PLDA XpressRich IP, move to PLDA
directory. Prepare for refactoring the codes.

[kwilczynski: commit log]
Link: https://lore.kernel.org/linux-pci/20240328091835.14797-3-minda.chen@starfivetech.com
Signed-off-by: Minda Chen <minda.chen@starfivetech.com>
Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 6809ee706e5dc261e44305ae0c5a2bbba19dbee2..b217f0e6242c367d8b2ac8cc3610ce80ceeac56c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -17455,7 +17455,7 @@ M:      Daire McNamara <daire.mcnamara@microchip.com>
 L:     linux-pci@vger.kernel.org
 S:     Supported
 F:     Documentation/devicetree/bindings/pci/microchip*
-F:     drivers/pci/controller/*microchip*
+F:     drivers/pci/controller/plda/*microchip*
 
 PCIE DRIVER FOR QUALCOMM MSM
 M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
@@ -19291,7 +19291,7 @@ F:      drivers/clk/microchip/clk-mpfs*.c
 F:     drivers/firmware/microchip/mpfs-auto-update.c
 F:     drivers/i2c/busses/i2c-microchip-corei2c.c
 F:     drivers/mailbox/mailbox-mpfs.c
-F:     drivers/pci/controller/pcie-microchip-host.c
+F:     drivers/pci/controller/plda/pcie-microchip-host.c
 F:     drivers/pwm/pwm-microchip-core.c
 F:     drivers/reset/reset-mpfs.c
 F:     drivers/rtc/rtc-mpfs.c

diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig
index e534c02ee34f80ee662783da066d58f9b8f9de52..4d2c188f58352775d62b0fe454f6900468e4bff0 100644 (file)
--- a/drivers/pci/controller/Kconfig
+++ b/drivers/pci/controller/Kconfig
@@ -215,14 +215,6 @@ config PCIE_MT7621
        help
          This selects a driver for the MediaTek MT7621 PCIe Controller.
 
-config PCIE_MICROCHIP_HOST
-       tristate "Microchip AXI PCIe controller"
-       depends on PCI_MSI && OF
-       select PCI_HOST_COMMON
-       help
-         Say Y here if you want kernel to support the Microchip AXI PCIe
-         Host Bridge driver.
-
 config PCI_HYPERV_INTERFACE
        tristate "Microsoft Hyper-V PCI Interface"
        depends on ((X86 && X86_64) || ARM64) && HYPERV && PCI_MSI
@@ -356,4 +348,5 @@ config PCIE_XILINX_CPM
 source "drivers/pci/controller/cadence/Kconfig"
 source "drivers/pci/controller/dwc/Kconfig"
 source "drivers/pci/controller/mobiveil/Kconfig"
+source "drivers/pci/controller/plda/Kconfig"
 endmenu

diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile
index f2b19e6174afd70bb331c3b4732629784f20cdd3..038ccbd9e3ba238c98c380a31aa5e1d34ec5fceb 100644 (file)
--- a/drivers/pci/controller/Makefile
+++ b/drivers/pci/controller/Makefile
@@ -33,7 +33,6 @@ obj-$(CONFIG_PCIE_ROCKCHIP_EP) += pcie-rockchip-ep.o
 obj-$(CONFIG_PCIE_ROCKCHIP_HOST) += pcie-rockchip-host.o
 obj-$(CONFIG_PCIE_MEDIATEK) += pcie-mediatek.o
 obj-$(CONFIG_PCIE_MEDIATEK_GEN3) += pcie-mediatek-gen3.o
-obj-$(CONFIG_PCIE_MICROCHIP_HOST) += pcie-microchip-host.o
 obj-$(CONFIG_VMD) += vmd.o
 obj-$(CONFIG_PCIE_BRCMSTB) += pcie-brcmstb.o
 obj-$(CONFIG_PCI_LOONGSON) += pci-loongson.o
@@ -44,6 +43,7 @@ obj-$(CONFIG_PCIE_MT7621) += pcie-mt7621.o
 # pcie-hisi.o quirks are needed even without CONFIG_PCIE_DW
 obj-y                          += dwc/
 obj-y                          += mobiveil/
+obj-y                          += plda/
 
 
 # The following drivers are for devices that use the generic ACPI

diff --git a/drivers/pci/controller/plda/Kconfig b/drivers/pci/controller/plda/Kconfig
new file mode 100644 (file)
index 0000000..5cb3be4
--- /dev/null
+++ b/drivers/pci/controller/plda/Kconfig
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0
+
+menu "PLDA-based PCIe controllers"
+       depends on PCI
+
+config PCIE_MICROCHIP_HOST
+       tristate "Microchip AXI PCIe controller"
+       depends on PCI_MSI && OF
+       select PCI_HOST_COMMON
+       help
+         Say Y here if you want kernel to support the Microchip AXI PCIe
+         Host Bridge driver.
+
+endmenu

diff --git a/drivers/pci/controller/plda/Makefile b/drivers/pci/controller/plda/Makefile
new file mode 100644 (file)
index 0000000..e1a265c
--- /dev/null
+++ b/drivers/pci/controller/plda/Makefile
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_PCIE_MICROCHIP_HOST) += pcie-microchip-host.o

diff --git a/drivers/pci/controller/pcie-microchip-host.c b/drivers/pci/controller/plda/pcie-microchip-host.c
similarity index 99%
rename from drivers/pci/controller/pcie-microchip-host.c
rename to drivers/pci/controller/plda/pcie-microchip-host.c
index 137fb8570ba26cafab9f4dfc04443c82010bd087..cb09a8137e2503a0b2ebe55d36bb18d9da1e1682 100644 (file)
--- a/drivers/pci/controller/pcie-microchip-host.c
+++ b/drivers/pci/controller/plda/pcie-microchip-host.c
@@ -18,7 +18,7 @@
 #include <linux/pci-ecam.h>
 #include <linux/platform_device.h>
 
-#include "../pci.h"
+#include "../../pci.h"
 
 /* Number of MSI IRQs */
 #define MC_MAX_NUM_MSI_IRQS                    32