Re: [PATCH] pinctrl: Move Airoha driver to dedicated directory

[Lorenzo Bianconi <lorenzo@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 5747 bytes --]

> In preparation for additional SoC support, move the Airoha pinctrl driver
> for AN7581 SoC to a dedicated directory.
> 
> This is to tidy things up and keep code organized without polluting the
> Mediatek driver directory.
> 
> The driver doesn't depend on any generic or common code from the Mediatek
> codebase so it can be safely moved without any modification.
> 
> Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>

> ---
>  MAINTAINERS                                   |  2 +-
>  drivers/pinctrl/Kconfig                       |  1 +
>  drivers/pinctrl/Makefile                      |  1 +
>  drivers/pinctrl/airoha/Kconfig                | 20 +++++++++++++++++++
>  drivers/pinctrl/airoha/Makefile               |  3 +++
>  .../{mediatek => airoha}/pinctrl-airoha.c     |  0
>  drivers/pinctrl/mediatek/Kconfig              | 17 +---------------
>  drivers/pinctrl/mediatek/Makefile             |  1 -
>  8 files changed, 27 insertions(+), 18 deletions(-)
>  create mode 100644 drivers/pinctrl/airoha/Kconfig
>  create mode 100644 drivers/pinctrl/airoha/Makefile
>  rename drivers/pinctrl/{mediatek => airoha}/pinctrl-airoha.c (100%)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 21c0ef0b9ce5..38bf92149a15 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -21024,7 +21024,7 @@ M:	Lorenzo Bianconi <lorenzo@kernel.org>
>  L:	linux-mediatek@lists.infradead.org (moderated for non-subscribers)
>  S:	Maintained
>  F:	Documentation/devicetree/bindings/pinctrl/airoha,en7581-pinctrl.yaml
> -F:	drivers/pinctrl/mediatek/pinctrl-airoha.c
> +F:	drivers/pinctrl/airoha/pinctrl-airoha.c
>  
>  PIN CONTROLLER - AMD
>  M:	Basavaraj Natikar <Basavaraj.Natikar@amd.com>
> diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
> index 03f2e3ee065f..e0babad31445 100644
> --- a/drivers/pinctrl/Kconfig
> +++ b/drivers/pinctrl/Kconfig
> @@ -679,6 +679,7 @@ config PINCTRL_RP1
>  	  multi function device.
>  
>  source "drivers/pinctrl/actions/Kconfig"
> +source "drivers/pinctrl/airoha/Kconfig"
>  source "drivers/pinctrl/aspeed/Kconfig"
>  source "drivers/pinctrl/bcm/Kconfig"
>  source "drivers/pinctrl/berlin/Kconfig"
> diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
> index f7d5d5f76d0c..36c55858801f 100644
> --- a/drivers/pinctrl/Makefile
> +++ b/drivers/pinctrl/Makefile
> @@ -66,6 +66,7 @@ obj-$(CONFIG_PINCTRL_ZYNQMP)	+= pinctrl-zynqmp.o
>  obj-$(CONFIG_PINCTRL_ZYNQ)	+= pinctrl-zynq.o
>  
>  obj-y				+= actions/
> +obj-y				+= airoha/
>  obj-$(CONFIG_ARCH_ASPEED)	+= aspeed/
>  obj-y				+= bcm/
>  obj-$(CONFIG_PINCTRL_BERLIN)	+= berlin/
> diff --git a/drivers/pinctrl/airoha/Kconfig b/drivers/pinctrl/airoha/Kconfig
> new file mode 100644
> index 000000000000..03adaeae8fc3
> --- /dev/null
> +++ b/drivers/pinctrl/airoha/Kconfig
> @@ -0,0 +1,20 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +menu "Airoha pinctrl drivers"
> +	depends on ARCH_AIROHA || COMPILE_TEST
> +
> +config PINCTRL_AIROHA
> +	tristate "Airoha EN7581 pin control"
> +	depends on OF
> +	depends on ARM64 || COMPILE_TEST
> +	select PINMUX
> +	select GENERIC_PINCONF
> +	select GENERIC_PINCTRL_GROUPS
> +	select GENERIC_PINMUX_FUNCTIONS
> +	select GPIOLIB
> +	select GPIOLIB_IRQCHIP
> +	select REGMAP_MMIO
> +	help
> +	  Say yes here to support pin controller and gpio driver
> +	  on Airoha EN7581 SoC.
> +
> +endmenu
> diff --git a/drivers/pinctrl/airoha/Makefile b/drivers/pinctrl/airoha/Makefile
> new file mode 100644
> index 000000000000..a25b744dd7a8
> --- /dev/null
> +++ b/drivers/pinctrl/airoha/Makefile
> @@ -0,0 +1,3 @@
> +# SPDX-License-Identifier: GPL-2.0
> +
> +obj-$(CONFIG_PINCTRL_AIROHA)		+= pinctrl-airoha.o
> diff --git a/drivers/pinctrl/mediatek/pinctrl-airoha.c b/drivers/pinctrl/airoha/pinctrl-airoha.c
> similarity index 100%
> rename from drivers/pinctrl/mediatek/pinctrl-airoha.c
> rename to drivers/pinctrl/airoha/pinctrl-airoha.c
> diff --git a/drivers/pinctrl/mediatek/Kconfig b/drivers/pinctrl/mediatek/Kconfig
> index 4819617d9368..97980cc28b9c 100644
> --- a/drivers/pinctrl/mediatek/Kconfig
> +++ b/drivers/pinctrl/mediatek/Kconfig
> @@ -1,6 +1,6 @@
>  # SPDX-License-Identifier: GPL-2.0-only
>  menu "MediaTek pinctrl drivers"
> -	depends on ARCH_MEDIATEK || ARCH_AIROHA || RALINK || COMPILE_TEST
> +	depends on ARCH_MEDIATEK || RALINK || COMPILE_TEST
>  
>  config EINT_MTK
>  	tristate "MediaTek External Interrupt Support"
> @@ -126,21 +126,6 @@ config PINCTRL_MT8127
>  	select PINCTRL_MTK
>  
>  # For ARMv8 SoCs
> -config PINCTRL_AIROHA
> -	tristate "Airoha EN7581 pin control"
> -	depends on OF
> -	depends on ARM64 || COMPILE_TEST
> -	select PINMUX
> -	select GENERIC_PINCONF
> -	select GENERIC_PINCTRL_GROUPS
> -	select GENERIC_PINMUX_FUNCTIONS
> -	select GPIOLIB
> -	select GPIOLIB_IRQCHIP
> -	select REGMAP_MMIO
> -	help
> -	  Say yes here to support pin controller and gpio driver
> -	  on Airoha EN7581 SoC.
> -
>  config PINCTRL_MT2712
>  	bool "MediaTek MT2712 pin control"
>  	depends on OF
> diff --git a/drivers/pinctrl/mediatek/Makefile b/drivers/pinctrl/mediatek/Makefile
> index ae765bd99965..6dc17b0c23f9 100644
> --- a/drivers/pinctrl/mediatek/Makefile
> +++ b/drivers/pinctrl/mediatek/Makefile
> @@ -8,7 +8,6 @@ obj-$(CONFIG_PINCTRL_MTK_MOORE)		+= pinctrl-moore.o
>  obj-$(CONFIG_PINCTRL_MTK_PARIS)		+= pinctrl-paris.o
>  
>  # SoC Drivers
> -obj-$(CONFIG_PINCTRL_AIROHA)		+= pinctrl-airoha.o
>  obj-$(CONFIG_PINCTRL_MT7620)		+= pinctrl-mt7620.o
>  obj-$(CONFIG_PINCTRL_MT7621)		+= pinctrl-mt7621.o
>  obj-$(CONFIG_PINCTRL_MT76X8)		+= pinctrl-mt76x8.o
> -- 
> 2.53.0
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]