On Mon, Aug 17, 2020 at 6:46 AM Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx> wrote: > From: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx> > > Renesas related pinctrl CONFIGs are located many places, > 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@xxxxxxxxxxx> Reviewed-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx> Still wondering about moving drivers/pinctrl/pinctrl-rz{a1,a2,n1}.c into drivers/pinctrl/sh-pfc/, too. > --- a/drivers/pinctrl/Kconfig > +++ b/drivers/pinctrl/Kconfig > @@ -213,38 +213,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 c461a2f1927a..a16393e6b9c2 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 > @@ -52,6 +54,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 > @@ -199,3 +233,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@xxxxxxxxxxxxxx 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