[PATCH] pinctrl: sh-pfc: collect Renesas related CONFIGs in one place

[PATCH] pinctrl: sh-pfc: collect Renesas related CONFIGs in one place

[Kuninori Morimoto]

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Renesas related pinctrl CONFIGs are located many places when menuconfig,
and it is confusable.
This patch collects these into same place,
and group into "Renesas pinctrl drivers" menu.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 drivers/pinctrl/Kconfig        | 32 ------------------------------
 drivers/pinctrl/sh-pfc/Kconfig | 36 ++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 834c59950d1c..deb1ce8afbdb 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -205,38 +205,6 @@ config PINCTRL_ROCKCHIP
 	select GENERIC_IRQ_CHIP
 	select MFD_SYSCON
 
-config PINCTRL_RZA1
-	bool "Renesas RZ/A1 gpio and pinctrl driver"
-	depends on OF
-	depends on ARCH_R7S72100 || COMPILE_TEST
-	select GPIOLIB
-	select GENERIC_PINCTRL_GROUPS
-	select GENERIC_PINMUX_FUNCTIONS
-	select GENERIC_PINCONF
-	help
-	  This selects pinctrl driver for Renesas RZ/A1 platforms.
-
-config PINCTRL_RZA2
-	bool "Renesas RZ/A2 gpio and pinctrl driver"
-	depends on OF
-	depends on ARCH_R7S9210 || COMPILE_TEST
-	select GPIOLIB
-	select GENERIC_PINCTRL_GROUPS
-	select GENERIC_PINMUX_FUNCTIONS
-	select GENERIC_PINCONF
-	help
-	  This selects GPIO and pinctrl driver for Renesas RZ/A2 platforms.
-
-config PINCTRL_RZN1
-	bool "Renesas RZ/N1 pinctrl driver"
-	depends on OF
-	depends on ARCH_RZN1 || COMPILE_TEST
-	select GENERIC_PINCTRL_GROUPS
-	select GENERIC_PINMUX_FUNCTIONS
-	select GENERIC_PINCONF
-	help
-	  This selects pinctrl driver for Renesas RZ/N1 devices.
-
 config PINCTRL_SINGLE
 	tristate "One-register-per-pin type device tree based pinctrl driver"
 	depends on OF
diff --git a/drivers/pinctrl/sh-pfc/Kconfig b/drivers/pinctrl/sh-pfc/Kconfig
index 9552851b96f1..4200a3dcbb30 100644
--- a/drivers/pinctrl/sh-pfc/Kconfig
+++ b/drivers/pinctrl/sh-pfc/Kconfig
@@ -3,6 +3,8 @@
 # Renesas SH and SH Mobile PINCTRL drivers
 #
 
+menu "Renesas pinctrl drivers"
+
 config PINCTRL_SH_PFC
 	bool "Renesas SoC pin control support" if COMPILE_TEST && !(ARCH_RENESAS || SUPERH)
 	default y if ARCH_RENESAS || SUPERH
@@ -51,6 +53,38 @@ config PINCTRL_SH_PFC
 	help
 	  This enables pin control drivers for Renesas SuperH and ARM platforms
 
+config PINCTRL_RZA1
+	bool "RZ/A1 gpio and pinctrl driver"
+	depends on OF
+	depends on ARCH_R7S72100 || COMPILE_TEST
+	select GPIOLIB
+	select GENERIC_PINCTRL_GROUPS
+	select GENERIC_PINMUX_FUNCTIONS
+	select GENERIC_PINCONF
+	help
+	  This selects pinctrl driver for Renesas RZ/A1 platforms.
+
+config PINCTRL_RZA2
+	bool "RZ/A2 gpio and pinctrl driver"
+	depends on OF
+	depends on ARCH_R7S9210 || COMPILE_TEST
+	select GPIOLIB
+	select GENERIC_PINCTRL_GROUPS
+	select GENERIC_PINMUX_FUNCTIONS
+	select GENERIC_PINCONF
+	help
+	  This selects GPIO and pinctrl driver for Renesas RZ/A2 platforms.
+
+config PINCTRL_RZN1
+	bool "RZ/N1 pinctrl driver"
+	depends on OF
+	depends on ARCH_RZN1 || COMPILE_TEST
+	select GENERIC_PINCTRL_GROUPS
+	select GENERIC_PINMUX_FUNCTIONS
+	select GENERIC_PINCONF
+	help
+	  This selects pinctrl driver for Renesas RZ/N1 devices.
+
 config PINCTRL_SH_PFC_GPIO
 	select GPIOLIB
 	bool
@@ -195,3 +229,5 @@ config PINCTRL_PFC_SH7786
 config PINCTRL_PFC_SHX3
 	bool "SH-X3 pin control support" if COMPILE_TEST
 	select PINCTRL_SH_FUNC_GPIO
+
+endmenu
-- 
2.25.1

Re: [PATCH] pinctrl: sh-pfc: collect Renesas related CONFIGs in one place

[Geert Uytterhoeven]

Hi Morimoto-san,

On Tue, Aug 4, 2020 at 8:11 AM Kuninori Morimoto
<kuninori.morimoto.gx@renesas.com> wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>
> Renesas related pinctrl CONFIGs are located many places when menuconfig,
> and it is confusable.
> This patch collects these into same place,
> and group into "Renesas pinctrl drivers" menu.
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Thanks for your patch!

> ---
>  drivers/pinctrl/Kconfig        | 32 ------------------------------
>  drivers/pinctrl/sh-pfc/Kconfig | 36 ++++++++++++++++++++++++++++++++++

Shouldn't the drivers be moved, and the Makefile be adapted, too?

The main reason why the RZ/A and RZ/N pin control drivers were not added
to the sh-pfc subdirectory is because they do not use the sh-pfc
framework.

Still, it may make sense to move them.
And perhaps rename the sh-pfc subdir to renesas?  It's the largest
subsystem shared by Renesas SuperH and ARM SoCs.

Linus: what's your opinion?
Thanks!

>  2 files changed, 36 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
> index 834c59950d1c..deb1ce8afbdb 100644
> --- a/drivers/pinctrl/Kconfig
> +++ b/drivers/pinctrl/Kconfig
> @@ -205,38 +205,6 @@ config PINCTRL_ROCKCHIP
>         select GENERIC_IRQ_CHIP
>         select MFD_SYSCON
>
> -config PINCTRL_RZA1
> -       bool "Renesas RZ/A1 gpio and pinctrl driver"
> -       depends on OF
> -       depends on ARCH_R7S72100 || COMPILE_TEST
> -       select GPIOLIB
> -       select GENERIC_PINCTRL_GROUPS
> -       select GENERIC_PINMUX_FUNCTIONS
> -       select GENERIC_PINCONF
> -       help
> -         This selects pinctrl driver for Renesas RZ/A1 platforms.
> -
> -config PINCTRL_RZA2
> -       bool "Renesas RZ/A2 gpio and pinctrl driver"
> -       depends on OF
> -       depends on ARCH_R7S9210 || COMPILE_TEST
> -       select GPIOLIB
> -       select GENERIC_PINCTRL_GROUPS
> -       select GENERIC_PINMUX_FUNCTIONS
> -       select GENERIC_PINCONF
> -       help
> -         This selects GPIO and pinctrl driver for Renesas RZ/A2 platforms.
> -
> -config PINCTRL_RZN1
> -       bool "Renesas RZ/N1 pinctrl driver"
> -       depends on OF
> -       depends on ARCH_RZN1 || COMPILE_TEST
> -       select GENERIC_PINCTRL_GROUPS
> -       select GENERIC_PINMUX_FUNCTIONS
> -       select GENERIC_PINCONF
> -       help
> -         This selects pinctrl driver for Renesas RZ/N1 devices.
> -
>  config PINCTRL_SINGLE
>         tristate "One-register-per-pin type device tree based pinctrl driver"
>         depends on OF
> diff --git a/drivers/pinctrl/sh-pfc/Kconfig b/drivers/pinctrl/sh-pfc/Kconfig
> index 9552851b96f1..4200a3dcbb30 100644
> --- a/drivers/pinctrl/sh-pfc/Kconfig
> +++ b/drivers/pinctrl/sh-pfc/Kconfig
> @@ -3,6 +3,8 @@
>  # Renesas SH and SH Mobile PINCTRL drivers
>  #
>
> +menu "Renesas pinctrl drivers"
> +
>  config PINCTRL_SH_PFC
>         bool "Renesas SoC pin control support" if COMPILE_TEST && !(ARCH_RENESAS || SUPERH)
>         default y if ARCH_RENESAS || SUPERH
> @@ -51,6 +53,38 @@ config PINCTRL_SH_PFC
>         help
>           This enables pin control drivers for Renesas SuperH and ARM platforms
>
> +config PINCTRL_RZA1
> +       bool "RZ/A1 gpio and pinctrl driver"
> +       depends on OF
> +       depends on ARCH_R7S72100 || COMPILE_TEST
> +       select GPIOLIB
> +       select GENERIC_PINCTRL_GROUPS
> +       select GENERIC_PINMUX_FUNCTIONS
> +       select GENERIC_PINCONF
> +       help
> +         This selects pinctrl driver for Renesas RZ/A1 platforms.
> +
> +config PINCTRL_RZA2
> +       bool "RZ/A2 gpio and pinctrl driver"
> +       depends on OF
> +       depends on ARCH_R7S9210 || COMPILE_TEST
> +       select GPIOLIB
> +       select GENERIC_PINCTRL_GROUPS
> +       select GENERIC_PINMUX_FUNCTIONS
> +       select GENERIC_PINCONF
> +       help
> +         This selects GPIO and pinctrl driver for Renesas RZ/A2 platforms.
> +
> +config PINCTRL_RZN1
> +       bool "RZ/N1 pinctrl driver"
> +       depends on OF
> +       depends on ARCH_RZN1 || COMPILE_TEST
> +       select GENERIC_PINCTRL_GROUPS
> +       select GENERIC_PINMUX_FUNCTIONS
> +       select GENERIC_PINCONF
> +       help
> +         This selects pinctrl driver for Renesas RZ/N1 devices.
> +
>  config PINCTRL_SH_PFC_GPIO
>         select GPIOLIB
>         bool
> @@ -195,3 +229,5 @@ config PINCTRL_PFC_SH7786
>  config PINCTRL_PFC_SHX3
>         bool "SH-X3 pin control support" if COMPILE_TEST
>         select PINCTRL_SH_FUNC_GPIO
> +
> +endmenu

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] pinctrl: sh-pfc: collect Renesas related CONFIGs in one place

[Kuninori Morimoto]

Hi Linus, Geert

> >  drivers/pinctrl/Kconfig        | 32 ------------------------------
> >  drivers/pinctrl/sh-pfc/Kconfig | 36 ++++++++++++++++++++++++++++++++++
> 
> Shouldn't the drivers be moved, and the Makefile be adapted, too?
(snip)
> And perhaps rename the sh-pfc subdir to renesas?  It's the largest
> subsystem shared by Renesas SuperH and ARM SoCs.
> 
> Linus: what's your opinion?

Hmm indeed.
rename sh-pfc to renesas, and move related drivers into it is nice idea
for me. But it will be big change/patch, So how about this ?

	1) Continue Kconfig (only) fixup
	2) rename folder name and move drivers into it if Linus was OK

Thank you for your help !!

Best regards
---
Kuninori Morimoto