lkml.org 
[lkml]   [2023]   [Oct]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v9 02/20] PCI: microchip: Move pcie-microchip-host.c to plda directory
    Date
    For Microchip Polarfire PCIe host is PLDA XpressRich IP,
    move to plda directory. Prepare for refactor the codes.

    Signed-off-by: Minda Chen <minda.chen@starfivetech.com>
    Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
    ---
    MAINTAINERS | 4 ++--
    drivers/pci/controller/Kconfig | 9 +--------
    drivers/pci/controller/Makefile | 2 +-
    drivers/pci/controller/plda/Kconfig | 14 ++++++++++++++
    drivers/pci/controller/plda/Makefile | 2 ++
    .../controller/{ => plda}/pcie-microchip-host.c | 2 +-
    6 files changed, 21 insertions(+), 12 deletions(-)
    create mode 100644 drivers/pci/controller/plda/Kconfig
    create mode 100644 drivers/pci/controller/plda/Makefile
    rename drivers/pci/controller/{ => plda}/pcie-microchip-host.c (99%)

    diff --git a/MAINTAINERS b/MAINTAINERS
    index 7a7bd8bd80e9..209558b9791f 100644
    --- a/MAINTAINERS
    +++ b/MAINTAINERS
    @@ -16646,7 +16646,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>
    @@ -18442,7 +18442,7 @@ F: drivers/char/hw_random/mpfs-rng.c
    F: drivers/clk/microchip/clk-mpfs*.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 c0c3f2824990..80e23013c229 100644
    --- 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
    @@ -345,4 +337,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 37c8663de7fe..93236dc97b21 100644
    --- a/drivers/pci/controller/Makefile
    +++ b/drivers/pci/controller/Makefile
    @@ -32,7 +32,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
    @@ -43,6 +42,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
    index 000000000000..5cb3be4fc98c
    --- /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
    index 000000000000..e1a265cbf91c
    --- /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 137fb8570ba2..cb09a8137e25 100644
    --- 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
    --
    2.17.1
    \
     
     \ /
      Last update: 2023-10-20 12:45    [W:4.241 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site