Skip to content

Commit 24934ee

Browse files
mindachen1987bjorn-helgaas
authored andcommitted
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>
1 parent 6873aaa commit 24934ee

6 files changed

Lines changed: 21 additions & 12 deletions

File tree

MAINTAINERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17455,7 +17455,7 @@ M: Daire McNamara <daire.mcnamara@microchip.com>
1745517455
L: linux-pci@vger.kernel.org
1745617456
S: Supported
1745717457
F: Documentation/devicetree/bindings/pci/microchip*
17458-
F: drivers/pci/controller/*microchip*
17458+
F: drivers/pci/controller/plda/*microchip*
1745917459

1746017460
PCIE DRIVER FOR QUALCOMM MSM
1746117461
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
@@ -19291,7 +19291,7 @@ F: drivers/clk/microchip/clk-mpfs*.c
1929119291
F: drivers/firmware/microchip/mpfs-auto-update.c
1929219292
F: drivers/i2c/busses/i2c-microchip-corei2c.c
1929319293
F: drivers/mailbox/mailbox-mpfs.c
19294-
F: drivers/pci/controller/pcie-microchip-host.c
19294+
F: drivers/pci/controller/plda/pcie-microchip-host.c
1929519295
F: drivers/pwm/pwm-microchip-core.c
1929619296
F: drivers/reset/reset-mpfs.c
1929719297
F: drivers/rtc/rtc-mpfs.c

drivers/pci/controller/Kconfig

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -215,14 +215,6 @@ config PCIE_MT7621
215215
help
216216
This selects a driver for the MediaTek MT7621 PCIe Controller.
217217

218-
config PCIE_MICROCHIP_HOST
219-
tristate "Microchip AXI PCIe controller"
220-
depends on PCI_MSI && OF
221-
select PCI_HOST_COMMON
222-
help
223-
Say Y here if you want kernel to support the Microchip AXI PCIe
224-
Host Bridge driver.
225-
226218
config PCI_HYPERV_INTERFACE
227219
tristate "Microsoft Hyper-V PCI Interface"
228220
depends on ((X86 && X86_64) || ARM64) && HYPERV && PCI_MSI
@@ -356,4 +348,5 @@ config PCIE_XILINX_CPM
356348
source "drivers/pci/controller/cadence/Kconfig"
357349
source "drivers/pci/controller/dwc/Kconfig"
358350
source "drivers/pci/controller/mobiveil/Kconfig"
351+
source "drivers/pci/controller/plda/Kconfig"
359352
endmenu

drivers/pci/controller/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ obj-$(CONFIG_PCIE_ROCKCHIP_EP) += pcie-rockchip-ep.o
3333
obj-$(CONFIG_PCIE_ROCKCHIP_HOST) += pcie-rockchip-host.o
3434
obj-$(CONFIG_PCIE_MEDIATEK) += pcie-mediatek.o
3535
obj-$(CONFIG_PCIE_MEDIATEK_GEN3) += pcie-mediatek-gen3.o
36-
obj-$(CONFIG_PCIE_MICROCHIP_HOST) += pcie-microchip-host.o
3736
obj-$(CONFIG_VMD) += vmd.o
3837
obj-$(CONFIG_PCIE_BRCMSTB) += pcie-brcmstb.o
3938
obj-$(CONFIG_PCI_LOONGSON) += pci-loongson.o
@@ -44,6 +43,7 @@ obj-$(CONFIG_PCIE_MT7621) += pcie-mt7621.o
4443
# pcie-hisi.o quirks are needed even without CONFIG_PCIE_DW
4544
obj-y += dwc/
4645
obj-y += mobiveil/
46+
obj-y += plda/
4747

4848

4949
# The following drivers are for devices that use the generic ACPI
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
3+
menu "PLDA-based PCIe controllers"
4+
depends on PCI
5+
6+
config PCIE_MICROCHIP_HOST
7+
tristate "Microchip AXI PCIe controller"
8+
depends on PCI_MSI && OF
9+
select PCI_HOST_COMMON
10+
help
11+
Say Y here if you want kernel to support the Microchip AXI PCIe
12+
Host Bridge driver.
13+
14+
endmenu
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
obj-$(CONFIG_PCIE_MICROCHIP_HOST) += pcie-microchip-host.o

drivers/pci/controller/pcie-microchip-host.c renamed to drivers/pci/controller/plda/pcie-microchip-host.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <linux/pci-ecam.h>
1919
#include <linux/platform_device.h>
2020

21-
#include "../pci.h"
21+
#include "../../pci.h"
2222

2323
/* Number of MSI IRQs */
2424
#define MC_MAX_NUM_MSI_IRQS 32

0 commit comments

Comments
 (0)