[PATCH v1 4/9] PCI: microchip: Move PCIe driver to PLDA directory

[Conor Dooley]

Hey Minda,

On Wed, Jul 19, 2023 at 06:20:52PM +0800, Minda Chen wrote:
> Move Microchip specific platform codes to PLDA directory.
> Including clock init, interrupt event handle and platform
> init codes.
> 
> Signed-off-by: Minda Chen <minda.chen at starfivetech.com>
> ---
>  MAINTAINERS                                   |   4 +-
>  drivers/pci/controller/Kconfig                |   8 -
>  drivers/pci/controller/Makefile               |   1 -
>  drivers/pci/controller/plda/Kconfig           |  10 +-
>  drivers/pci/controller/plda/Makefile          |   1 +
>  .../{ => plda}/pcie-microchip-host.c          | 594 ++----------------

I think that you should squash this with the previous patch, rather than
duplicate the code and then de-duplicate it, so that it is more obvious
what is being extracted.

>  6 files changed, 55 insertions(+), 563 deletions(-)
>  rename drivers/pci/controller/{ => plda}/pcie-microchip-host.c (50%)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 3b3c4d8808ae..f02618c2bdf5 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -16503,7 +16503,7 @@ M:	Daire McNamara <daire.mcnamara at microchip.com>
>  L:	linux-pci at 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 at linaro.org>
> @@ -18287,7 +18287,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 a106dabcb8dc..107cdb69e15c 100644
> --- a/drivers/pci/controller/Kconfig
> +++ b/drivers/pci/controller/Kconfig
> @@ -216,14 +216,6 @@ config PCIE_MT7621
>  	help
>  	  This selects a driver for the MediaTek MT7621 PCIe Controller.
>  
> -config PCIE_MICROCHIP_HOST
> -	bool "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
> diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile
> index aa0a691ebcbc..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
> diff --git a/drivers/pci/controller/plda/Kconfig b/drivers/pci/controller/plda/Kconfig
> index 37e17326671b..fb274976b84b 100644
> --- a/drivers/pci/controller/plda/Kconfig
> +++ b/drivers/pci/controller/plda/Kconfig
> @@ -4,8 +4,16 @@ menu "PLDA PCIe controllers support"
>  	depends on PCI
>  
>  config PCIE_PLDA_HOST
> -	bool "PLDA PCIe host controller"
> +	bool
>  	depends on OF && PCI_MSI

Is this okay w.r.t. unmet dependencies? IOW, if PCI_MSI is disabled,
PCIE_MICROCHIP_HOST can still select PCIE_PLDA_HOST, no?

>  	select IRQ_DOMAIN
>  
> +config PCIE_MICROCHIP_HOST
> +	bool "Microchip AXI PCIe controller"
> +	select PCI_HOST_COMMON
> +	select PCIE_PLDA_HOST
> +	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
> index 79dbae655c2b..4340ab007f44 100644
> --- a/drivers/pci/controller/plda/Makefile
> +++ b/drivers/pci/controller/plda/Makefile
> @@ -1,2 +1,3 @@
>  # SPDX-License-Identifier: GPL-2.0
>  obj-$(CONFIG_PCIE_PLDA_HOST) += pcie-plda-host.o
> +obj-$(CONFIG_PCIE_MICROCHIP_HOST) += pcie-microchip-host.o
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-riscv/attachments/20230720/be2c3033/attachment.sig>