[PATCH v4 0/4] pinctrl: sh-pfc: collect Renesas related CONFIGs in one place

[PATCH v4 0/4] pinctrl: sh-pfc: collect Renesas related CONFIGs in one place

[Kuninori Morimoto]

Hi Linus, Geert

These are v4 patch for Renesas pinctrl Kconfig.

Renesas related pinctrl CONFIGs are located random places on menuconfig,
because of it, it is confusable.
This patch collects these into same place.

This patch moves pinctrl-rza{a1,a2,n1}.c to sh-pfc,
but not renamed "sh-pfc" to "renesas".

These are based on renesas-drivers-2020-08-18-v5.9-rc1

v3 -> v4
	- fixup pinctrl-rz{a1,a2,n1}.c compile error

v2 -> v3
	- tidyup "AV2" to "EV2"
	- move pinctrl-rza{a1,a2,n1}.c to sh-pfc
	- sort all drivers

v1 -> v2
	- align driver description title
	- sort  driver description title

Kuninori Morimoto (4):
  pinctrl: sh-pfc: tidyup Emma Mobile EV2
  pinctrl: sh-pfc: collect Renesas related CONFIGs in one place
  pinctrl: sh-pfc: align driver description title
  pinctrl: sh-pfc: tidy up driver description title

 drivers/pinctrl/Kconfig                     |  32 ----
 drivers/pinctrl/Makefile                    |   3 -
 drivers/pinctrl/sh-pfc/Kconfig              | 181 ++++++++++++--------
 drivers/pinctrl/sh-pfc/Makefile             |   4 +
 drivers/pinctrl/{ => sh-pfc}/pinctrl-rza1.c |   0
 drivers/pinctrl/{ => sh-pfc}/pinctrl-rza2.c |   0
 drivers/pinctrl/{ => sh-pfc}/pinctrl-rzn1.c |   0
 7 files changed, 114 insertions(+), 106 deletions(-)
 rename drivers/pinctrl/{ => sh-pfc}/pinctrl-rza1.c (100%)
 rename drivers/pinctrl/{ => sh-pfc}/pinctrl-rza2.c (100%)
 rename drivers/pinctrl/{ => sh-pfc}/pinctrl-rzn1.c (100%)

-- 
2.25.1

[PATCH v4 1/4] pinctrl: sh-pfc: tidyup Emma Mobile EV2

[Kuninori Morimoto]

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

It is "Emma Mobile EV2" not "AV2".
This patch tidyup it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/pinctrl/sh-pfc/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pinctrl/sh-pfc/Kconfig b/drivers/pinctrl/sh-pfc/Kconfig
index 7fdc7ed8bd2e..8b2b1e1a9047 100644
--- a/drivers/pinctrl/sh-pfc/Kconfig
+++ b/drivers/pinctrl/sh-pfc/Kconfig
@@ -66,7 +66,7 @@ config PINCTRL_SH_FUNC_GPIO
 	  This enables legacy function GPIOs for SH platforms
 
 config PINCTRL_PFC_EMEV2
-	bool "Emma Mobile AV2 pin control support" if COMPILE_TEST
+	bool "Emma Mobile EV2 pin control support" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A73A4
 	bool "R-Mobile APE6 pin control support" if COMPILE_TEST
-- 
2.25.1

[PATCH v4 2/4] 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,
and it is confusable.
This patch collects these into same place,
and group into "Renesas pinctrl drivers" menu.
This patch also moves pinctrl-rz{a1,a2,n1}.c into sh-pfc folder.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/pinctrl/Kconfig                     | 32 ------------------
 drivers/pinctrl/Makefile                    |  3 --
 drivers/pinctrl/sh-pfc/Kconfig              | 36 +++++++++++++++++++++
 drivers/pinctrl/sh-pfc/Makefile             |  4 +++
 drivers/pinctrl/{ => sh-pfc}/pinctrl-rza1.c |  8 ++---
 drivers/pinctrl/{ => sh-pfc}/pinctrl-rza2.c |  4 +--
 drivers/pinctrl/{ => sh-pfc}/pinctrl-rzn1.c |  6 ++--
 7 files changed, 49 insertions(+), 44 deletions(-)
 rename drivers/pinctrl/{ => sh-pfc}/pinctrl-rza1.c (99%)
 rename drivers/pinctrl/{ => sh-pfc}/pinctrl-rza2.c (99%)
 rename drivers/pinctrl/{ => sh-pfc}/pinctrl-rzn1.c (99%)

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 8828613c4e0e..f63c5a04a3f7 100644
--- 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/Makefile b/drivers/pinctrl/Makefile
index 1731b2154df9..1da9f28aecbd 100644
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -30,9 +30,6 @@ obj-$(CONFIG_PINCTRL_PALMAS)	+= pinctrl-palmas.o
 obj-$(CONFIG_PINCTRL_PIC32)	+= pinctrl-pic32.o
 obj-$(CONFIG_PINCTRL_PISTACHIO)	+= pinctrl-pistachio.o
 obj-$(CONFIG_PINCTRL_ROCKCHIP)	+= pinctrl-rockchip.o
-obj-$(CONFIG_PINCTRL_RZA1)	+= pinctrl-rza1.o
-obj-$(CONFIG_PINCTRL_RZA2)	+= pinctrl-rza2.o
-obj-$(CONFIG_PINCTRL_RZN1)	+= pinctrl-rzn1.o
 obj-$(CONFIG_PINCTRL_SINGLE)	+= pinctrl-single.o
 obj-$(CONFIG_PINCTRL_SIRF)	+= sirf/
 obj-$(CONFIG_PINCTRL_SX150X)	+= pinctrl-sx150x.o
diff --git a/drivers/pinctrl/sh-pfc/Kconfig b/drivers/pinctrl/sh-pfc/Kconfig
index 8b2b1e1a9047..ff10bb2ed497 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
@@ -53,6 +55,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
@@ -203,3 +237,5 @@ config PINCTRL_PFC_SH7786
 config PINCTRL_PFC_SHX3
 	bool "SH-X3 pin control support" if COMPILE_TEST
 	select PINCTRL_SH_FUNC_GPIO
+
+endmenu
diff --git a/drivers/pinctrl/sh-pfc/Makefile b/drivers/pinctrl/sh-pfc/Makefile
index 7bb99187cd8e..0b5640cf457b 100644
--- a/drivers/pinctrl/sh-pfc/Makefile
+++ b/drivers/pinctrl/sh-pfc/Makefile
@@ -43,6 +43,10 @@ obj-$(CONFIG_PINCTRL_PFC_SH7785)	+= pfc-sh7785.o
 obj-$(CONFIG_PINCTRL_PFC_SH7786)	+= pfc-sh7786.o
 obj-$(CONFIG_PINCTRL_PFC_SHX3)		+= pfc-shx3.o
 
+obj-$(CONFIG_PINCTRL_RZA1)	+= pinctrl-rza1.o
+obj-$(CONFIG_PINCTRL_RZA2)	+= pinctrl-rza2.o
+obj-$(CONFIG_PINCTRL_RZN1)	+= pinctrl-rzn1.o
+
 ifeq ($(CONFIG_COMPILE_TEST),y)
 CFLAGS_pfc-sh7203.o	+= -I$(srctree)/arch/sh/include/cpu-sh2a
 CFLAGS_pfc-sh7264.o	+= -I$(srctree)/arch/sh/include/cpu-sh2a
diff --git a/drivers/pinctrl/pinctrl-rza1.c b/drivers/pinctrl/sh-pfc/pinctrl-rza1.c
similarity index 99%
rename from drivers/pinctrl/pinctrl-rza1.c
rename to drivers/pinctrl/sh-pfc/pinctrl-rza1.c
index 511f232ab7bc..a0cb586a46b7 100644
--- a/drivers/pinctrl/pinctrl-rza1.c
+++ b/drivers/pinctrl/sh-pfc/pinctrl-rza1.c
@@ -26,10 +26,10 @@
 #include <linux/pinctrl/pinmux.h>
 #include <linux/slab.h>
 
-#include "core.h"
-#include "devicetree.h"
-#include "pinconf.h"
-#include "pinmux.h"
+#include "../core.h"
+#include "../devicetree.h"
+#include "../pinconf.h"
+#include "../pinmux.h"
 
 #define DRIVER_NAME			"pinctrl-rza1"
 
diff --git a/drivers/pinctrl/pinctrl-rza2.c b/drivers/pinctrl/sh-pfc/pinctrl-rza2.c
similarity index 99%
rename from drivers/pinctrl/pinctrl-rza2.c
rename to drivers/pinctrl/sh-pfc/pinctrl-rza2.c
index c5bf98c86b2b..32829eb9656c 100644
--- a/drivers/pinctrl/pinctrl-rza2.c
+++ b/drivers/pinctrl/sh-pfc/pinctrl-rza2.c
@@ -17,8 +17,8 @@
 #include <linux/of_device.h>
 #include <linux/pinctrl/pinmux.h>
 
-#include "core.h"
-#include "pinmux.h"
+#include "../core.h"
+#include "../pinmux.h"
 
 #define DRIVER_NAME		"pinctrl-rza2"
 
diff --git a/drivers/pinctrl/pinctrl-rzn1.c b/drivers/pinctrl/sh-pfc/pinctrl-rzn1.c
similarity index 99%
rename from drivers/pinctrl/pinctrl-rzn1.c
rename to drivers/pinctrl/sh-pfc/pinctrl-rzn1.c
index 39538d40dbf3..ef5fb25b6016 100644
--- a/drivers/pinctrl/pinctrl-rzn1.c
+++ b/drivers/pinctrl/sh-pfc/pinctrl-rzn1.c
@@ -17,9 +17,9 @@
 #include <linux/pinctrl/pinmux.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include "core.h"
-#include "pinconf.h"
-#include "pinctrl-utils.h"
+#include "../core.h"
+#include "../pinconf.h"
+#include "../pinctrl-utils.h"
 
 /* Field positions and masks in the pinmux registers */
 #define RZN1_L1_PIN_DRIVE_STRENGTH	10
-- 
2.25.1

[PATCH v4 3/4] pinctrl: sh-pfc: align driver description title

[Kuninori Morimoto]

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

Now, Renesas Pin Control drivers are under menu,
but current description are not aligned.
This patch align these.

	- Emma Mobile EV2 pin control support
	- R-Mobile APE6 pin control support
	- R-Mobile A1 pin control support
	- RZ/N1 pin control support
	- RZ/G1H pin control support
	- RZ/G1M pin control support

	+ pin control support for Emma Mobile EV2
	+ pin control support for R-Mobile APE6
	+ pin control support for R-Mobile A1
	+ pin control support for RZ/N1
	+ pin control support for RZ/G1H
	+ pin control support for RZ/G1M

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/pinctrl/sh-pfc/Kconfig | 88 +++++++++++++++++-----------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/drivers/pinctrl/sh-pfc/Kconfig b/drivers/pinctrl/sh-pfc/Kconfig
index ff10bb2ed497..c27861fa557d 100644
--- a/drivers/pinctrl/sh-pfc/Kconfig
+++ b/drivers/pinctrl/sh-pfc/Kconfig
@@ -56,7 +56,7 @@ config PINCTRL_SH_PFC
 	  This enables pin control drivers for Renesas SuperH and ARM platforms
 
 config PINCTRL_RZA1
-	bool "RZ/A1 gpio and pinctrl driver"
+	bool "gpio and pinctrl driver for RZ/A1"
 	depends on OF
 	depends on ARCH_R7S72100 || COMPILE_TEST
 	select GPIOLIB
@@ -67,7 +67,7 @@ config PINCTRL_RZA1
 	  This selects pinctrl driver for Renesas RZ/A1 platforms.
 
 config PINCTRL_RZA2
-	bool "RZ/A2 gpio and pinctrl driver"
+	bool "gpio and pinctrl driver for RZ/A2"
 	depends on OF
 	depends on ARCH_R7S9210 || COMPILE_TEST
 	select GPIOLIB
@@ -78,7 +78,7 @@ config PINCTRL_RZA2
 	  This selects GPIO and pinctrl driver for Renesas RZ/A2 platforms.
 
 config PINCTRL_RZN1
-	bool "RZ/N1 pinctrl driver"
+	bool "pin control support for RZ/N1"
 	depends on OF
 	depends on ARCH_RZN1 || COMPILE_TEST
 	select GENERIC_PINCTRL_GROUPS
@@ -100,142 +100,142 @@ config PINCTRL_SH_FUNC_GPIO
 	  This enables legacy function GPIOs for SH platforms
 
 config PINCTRL_PFC_EMEV2
-	bool "Emma Mobile EV2 pin control support" if COMPILE_TEST
+	bool "pin control support for Emma Mobile EV2" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A73A4
-	bool "R-Mobile APE6 pin control support" if COMPILE_TEST
+	bool "pin control support for R-Mobile APE6" if COMPILE_TEST
 	select PINCTRL_SH_PFC_GPIO
 
 config PINCTRL_PFC_R8A7740
-	bool "R-Mobile A1 pin control support" if COMPILE_TEST
+	bool "pin control support for R-Mobile A1" if COMPILE_TEST
 	select PINCTRL_SH_PFC_GPIO
 
 config PINCTRL_PFC_R8A7742
-	bool "RZ/G1H pin control support" if COMPILE_TEST
+	bool "pin control support for RZ/G1H" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A7743
-	bool "RZ/G1M pin control support" if COMPILE_TEST
+	bool "pin control support for RZ/G1M" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A7744
-	bool "RZ/G1N pin control support" if COMPILE_TEST
+	bool "pin control support for RZ/G1N" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A7745
-	bool "RZ/G1E pin control support" if COMPILE_TEST
+	bool "pin control support for RZ/G1E" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A77470
-	bool "RZ/G1C pin control support" if COMPILE_TEST
+	bool "pin control support for RZ/G1C" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A774A1
-	bool "RZ/G2M pin control support" if COMPILE_TEST
+	bool "pin control support for RZ/G2M" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A774B1
-	bool "RZ/G2N pin control support" if COMPILE_TEST
+	bool "pin control support for RZ/G2N" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A774C0
-	bool "RZ/G2E pin control support" if COMPILE_TEST
+	bool "pin control support for RZ/G2E" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A774E1
-	bool "RZ/G2H pin control support" if COMPILE_TEST
+	bool "pin control support for RZ/G2H" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A7778
-	bool "R-Car M1A pin control support" if COMPILE_TEST
+	bool "pin control support for R-Car M1A" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A7779
-	bool "R-Car H1 pin control support" if COMPILE_TEST
+	bool "pin control support for R-Car H1" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A7790
-	bool "R-Car H2 pin control support" if COMPILE_TEST
+	bool "pin control support for R-Car H2" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A7791
-	bool "R-Car M2-W pin control support" if COMPILE_TEST
+	bool "pin control support for R-Car M2-W" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A7792
-	bool "R-Car V2H pin control support" if COMPILE_TEST
+	bool "pin control support for R-Car V2H" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A7793
-	bool "R-Car M2-N pin control support" if COMPILE_TEST
+	bool "pin control support for R-Car M2-N" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A7794
-	bool "R-Car E2 pin control support" if COMPILE_TEST
+	bool "pin control support for R-Car E2" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A77950
-	bool "R-Car H3 ES1.x pin control support" if COMPILE_TEST
+	bool "pin control support for R-Car H3 ES1.x" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A77951
-	bool "R-Car H3 ES2.0+ pin control support" if COMPILE_TEST
+	bool "pin control support for R-Car H3 ES2.0+" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A77960
-	bool "R-Car M3-W pin control support" if COMPILE_TEST
+	bool "pin control support for R-Car M3-W" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A77961
-	bool "R-Car M3-W+ pin control support" if COMPILE_TEST
+	bool "pin control support for R-Car M3-W+" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A77965
-	bool "R-Car M3-N pin control support" if COMPILE_TEST
+	bool "pin control support for R-Car M3-N" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A77970
-	bool "R-Car V3M pin control support" if COMPILE_TEST
+	bool "pin control support for R-Car V3M" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A77980
-	bool "R-Car V3H pin control support" if COMPILE_TEST
+	bool "pin control support for R-Car V3H" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A77990
-	bool "R-Car E3 pin control support" if COMPILE_TEST
+	bool "pin control support for R-Car E3" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A77995
-	bool "R-Car D3 pin control support" if COMPILE_TEST
+	bool "pin control support for R-Car D3" if COMPILE_TEST
 
 config PINCTRL_PFC_SH7203
-	bool "SH7203 pin control support" if COMPILE_TEST
+	bool "pin control support for SH7203" if COMPILE_TEST
 	select PINCTRL_SH_FUNC_GPIO
 
 config PINCTRL_PFC_SH7264
-	bool "SH7264 pin control support" if COMPILE_TEST
+	bool "pin control support for SH7264" if COMPILE_TEST
 	select PINCTRL_SH_FUNC_GPIO
 
 config PINCTRL_PFC_SH7269
-	bool "SH7269 pin control support" if COMPILE_TEST
+	bool "pin control support for SH7269" if COMPILE_TEST
 	select PINCTRL_SH_FUNC_GPIO
 
 config PINCTRL_PFC_SH73A0
-	bool "SH-Mobile AG5 pin control support" if COMPILE_TEST
+	bool "pin control support for SH-Mobile AG5" if COMPILE_TEST
 	select PINCTRL_SH_PFC_GPIO
 	select REGULATOR
 
 config PINCTRL_PFC_SH7720
-	bool "SH7720 pin control support" if COMPILE_TEST
+	bool "pin control support for SH7720" if COMPILE_TEST
 	select PINCTRL_SH_FUNC_GPIO
 
 config PINCTRL_PFC_SH7722
-	bool "SH7722 pin control support" if COMPILE_TEST
+	bool "pin control support for SH7722" if COMPILE_TEST
 	select PINCTRL_SH_FUNC_GPIO
 
 config PINCTRL_PFC_SH7723
-	bool "SH-Mobile R2 pin control support" if COMPILE_TEST
+	bool "pin control support for SH-Mobile R2" if COMPILE_TEST
 	select PINCTRL_SH_FUNC_GPIO
 
 config PINCTRL_PFC_SH7724
-	bool "SH-Mobile R2R pin control support" if COMPILE_TEST
+	bool "pin control support for SH-Mobile R2R" if COMPILE_TEST
 	select PINCTRL_SH_FUNC_GPIO
 
 config PINCTRL_PFC_SH7734
-	bool "SH7734 pin control support" if COMPILE_TEST
+	bool "pin control support for SH7734" if COMPILE_TEST
 	select PINCTRL_SH_FUNC_GPIO
 
 config PINCTRL_PFC_SH7757
-	bool "SH7757 pin control support" if COMPILE_TEST
+	bool "pin control support for SH7757" if COMPILE_TEST
 	select PINCTRL_SH_FUNC_GPIO
 
 config PINCTRL_PFC_SH7785
-	bool "SH7785 pin control support" if COMPILE_TEST
+	bool "pin control support for SH7785" if COMPILE_TEST
 	select PINCTRL_SH_FUNC_GPIO
 
 config PINCTRL_PFC_SH7786
-	bool "SH7786 pin control support" if COMPILE_TEST
+	bool "pin control support for SH7786" if COMPILE_TEST
 	select PINCTRL_SH_FUNC_GPIO
 
 config PINCTRL_PFC_SHX3
-	bool "SH-X3 pin control support" if COMPILE_TEST
+	bool "pin control support for SH-X3" if COMPILE_TEST
 	select PINCTRL_SH_FUNC_GPIO
 
 endmenu
-- 
2.25.1

[PATCH v4 4/4] pinctrl: sh-pfc: tidy up driver description title

[Kuninori Morimoto]

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

This patch sorts each driver by description title alphabetical order.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/pinctrl/sh-pfc/Kconfig | 121 +++++++++++++++++----------------
 1 file changed, 62 insertions(+), 59 deletions(-)

diff --git a/drivers/pinctrl/sh-pfc/Kconfig b/drivers/pinctrl/sh-pfc/Kconfig
index c27861fa557d..5c2a8916e439 100644
--- a/drivers/pinctrl/sh-pfc/Kconfig
+++ b/drivers/pinctrl/sh-pfc/Kconfig
@@ -77,16 +77,6 @@ config PINCTRL_RZA2
 	help
 	  This selects GPIO and pinctrl driver for Renesas RZ/A2 platforms.
 
-config PINCTRL_RZN1
-	bool "pin control support for RZ/N1"
-	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
@@ -102,13 +92,13 @@ config PINCTRL_SH_FUNC_GPIO
 config PINCTRL_PFC_EMEV2
 	bool "pin control support for Emma Mobile EV2" if COMPILE_TEST
 
-config PINCTRL_PFC_R8A73A4
-	bool "pin control support for R-Mobile APE6" if COMPILE_TEST
-	select PINCTRL_SH_PFC_GPIO
 
-config PINCTRL_PFC_R8A7740
-	bool "pin control support for R-Mobile A1" if COMPILE_TEST
-	select PINCTRL_SH_PFC_GPIO
+
+config PINCTRL_PFC_R8A77470
+	bool "pin control support for RZ/G1C" if COMPILE_TEST
+
+config PINCTRL_PFC_R8A7745
+	bool "pin control support for RZ/G1E" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A7742
 	bool "pin control support for RZ/G1H" if COMPILE_TEST
@@ -119,11 +109,11 @@ config PINCTRL_PFC_R8A7743
 config PINCTRL_PFC_R8A7744
 	bool "pin control support for RZ/G1N" if COMPILE_TEST
 
-config PINCTRL_PFC_R8A7745
-	bool "pin control support for RZ/G1E" if COMPILE_TEST
+config PINCTRL_PFC_R8A774C0
+	bool "pin control support for RZ/G2E" if COMPILE_TEST
 
-config PINCTRL_PFC_R8A77470
-	bool "pin control support for RZ/G1C" if COMPILE_TEST
+config PINCTRL_PFC_R8A774E1
+	bool "pin control support for RZ/G2H" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A774A1
 	bool "pin control support for RZ/G2M" if COMPILE_TEST
@@ -131,14 +121,25 @@ config PINCTRL_PFC_R8A774A1
 config PINCTRL_PFC_R8A774B1
 	bool "pin control support for RZ/G2N" if COMPILE_TEST
 
-config PINCTRL_PFC_R8A774C0
-	bool "pin control support for RZ/G2E" if COMPILE_TEST
+config PINCTRL_RZN1
+	bool "pin control support for RZ/N1"
+	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_PFC_R8A774E1
-	bool "pin control support for RZ/G2H" if COMPILE_TEST
 
-config PINCTRL_PFC_R8A7778
-	bool "pin control support for R-Car M1A" if COMPILE_TEST
+config PINCTRL_PFC_R8A77995
+	bool "pin control support for R-Car D3" if COMPILE_TEST
+
+config PINCTRL_PFC_R8A7794
+	bool "pin control support for R-Car E2" if COMPILE_TEST
+
+config PINCTRL_PFC_R8A77990
+	bool "pin control support for R-Car E3" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A7779
 	bool "pin control support for R-Car H1" if COMPILE_TEST
@@ -146,23 +147,23 @@ config PINCTRL_PFC_R8A7779
 config PINCTRL_PFC_R8A7790
 	bool "pin control support for R-Car H2" if COMPILE_TEST
 
-config PINCTRL_PFC_R8A7791
-	bool "pin control support for R-Car M2-W" if COMPILE_TEST
+config PINCTRL_PFC_R8A77950
+	bool "pin control support for R-Car H3 ES1.x" if COMPILE_TEST
 
-config PINCTRL_PFC_R8A7792
-	bool "pin control support for R-Car V2H" if COMPILE_TEST
+config PINCTRL_PFC_R8A77951
+	bool "pin control support for R-Car H3 ES2.0+" if COMPILE_TEST
+
+config PINCTRL_PFC_R8A7778
+	bool "pin control support for R-Car M1A" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A7793
 	bool "pin control support for R-Car M2-N" if COMPILE_TEST
 
-config PINCTRL_PFC_R8A7794
-	bool "pin control support for R-Car E2" if COMPILE_TEST
-
-config PINCTRL_PFC_R8A77950
-	bool "pin control support for R-Car H3 ES1.x" if COMPILE_TEST
+config PINCTRL_PFC_R8A7791
+	bool "pin control support for R-Car M2-W" if COMPILE_TEST
 
-config PINCTRL_PFC_R8A77951
-	bool "pin control support for R-Car H3 ES2.0+" if COMPILE_TEST
+config PINCTRL_PFC_R8A77965
+	bool "pin control support for R-Car M3-N" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A77960
 	bool "pin control support for R-Car M3-W" if COMPILE_TEST
@@ -170,20 +171,22 @@ config PINCTRL_PFC_R8A77960
 config PINCTRL_PFC_R8A77961
 	bool "pin control support for R-Car M3-W+" if COMPILE_TEST
 
-config PINCTRL_PFC_R8A77965
-	bool "pin control support for R-Car M3-N" if COMPILE_TEST
-
-config PINCTRL_PFC_R8A77970
-	bool "pin control support for R-Car V3M" if COMPILE_TEST
+config PINCTRL_PFC_R8A7792
+	bool "pin control support for R-Car V2H" if COMPILE_TEST
 
 config PINCTRL_PFC_R8A77980
 	bool "pin control support for R-Car V3H" if COMPILE_TEST
 
-config PINCTRL_PFC_R8A77990
-	bool "pin control support for R-Car E3" if COMPILE_TEST
+config PINCTRL_PFC_R8A77970
+	bool "pin control support for R-Car V3M" if COMPILE_TEST
 
-config PINCTRL_PFC_R8A77995
-	bool "pin control support for R-Car D3" if COMPILE_TEST
+config PINCTRL_PFC_R8A7740
+	bool "pin control support for R-Mobile A1" if COMPILE_TEST
+	select PINCTRL_SH_PFC_GPIO
+
+config PINCTRL_PFC_R8A73A4
+	bool "pin control support for R-Mobile APE6" if COMPILE_TEST
+	select PINCTRL_SH_PFC_GPIO
 
 config PINCTRL_PFC_SH7203
 	bool "pin control support for SH7203" if COMPILE_TEST
@@ -197,11 +200,6 @@ config PINCTRL_PFC_SH7269
 	bool "pin control support for SH7269" if COMPILE_TEST
 	select PINCTRL_SH_FUNC_GPIO
 
-config PINCTRL_PFC_SH73A0
-	bool "pin control support for SH-Mobile AG5" if COMPILE_TEST
-	select PINCTRL_SH_PFC_GPIO
-	select REGULATOR
-
 config PINCTRL_PFC_SH7720
 	bool "pin control support for SH7720" if COMPILE_TEST
 	select PINCTRL_SH_FUNC_GPIO
@@ -210,14 +208,6 @@ config PINCTRL_PFC_SH7722
 	bool "pin control support for SH7722" if COMPILE_TEST
 	select PINCTRL_SH_FUNC_GPIO
 
-config PINCTRL_PFC_SH7723
-	bool "pin control support for SH-Mobile R2" if COMPILE_TEST
-	select PINCTRL_SH_FUNC_GPIO
-
-config PINCTRL_PFC_SH7724
-	bool "pin control support for SH-Mobile R2R" if COMPILE_TEST
-	select PINCTRL_SH_FUNC_GPIO
-
 config PINCTRL_PFC_SH7734
 	bool "pin control support for SH7734" if COMPILE_TEST
 	select PINCTRL_SH_FUNC_GPIO
@@ -234,6 +224,19 @@ config PINCTRL_PFC_SH7786
 	bool "pin control support for SH7786" if COMPILE_TEST
 	select PINCTRL_SH_FUNC_GPIO
 
+config PINCTRL_PFC_SH73A0
+	bool "pin control support for SH-Mobile AG5" if COMPILE_TEST
+	select PINCTRL_SH_PFC_GPIO
+	select REGULATOR
+
+config PINCTRL_PFC_SH7723
+	bool "pin control support for SH-Mobile R2" if COMPILE_TEST
+	select PINCTRL_SH_FUNC_GPIO
+
+config PINCTRL_PFC_SH7724
+	bool "pin control support for SH-Mobile R2R" if COMPILE_TEST
+	select PINCTRL_SH_FUNC_GPIO
+
 config PINCTRL_PFC_SHX3
 	bool "pin control support for SH-X3" if COMPILE_TEST
 	select PINCTRL_SH_FUNC_GPIO
-- 
2.25.1

Re: [PATCH v4 1/4] pinctrl: sh-pfc: tidyup Emma Mobile EV2

[Geert Uytterhoeven]

On Mon, Aug 24, 2020 at 7:49 AM Kuninori Morimoto
<kuninori.morimoto.gx@renesas.com> wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>
> It is "Emma Mobile EV2" not "AV2".
> This patch tidyup it.
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
i.e. will queue in sh-pfc-for-v5.10.

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 v4 3/4] pinctrl: sh-pfc: align driver description title

[Geert Uytterhoeven]

Hi Morimoto-san,

On Mon, Aug 24, 2020 at 7:49 AM Kuninori Morimoto
<kuninori.morimoto.gx@renesas.com> wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>
> Now, Renesas Pin Control drivers are under menu,
> but current description are not aligned.
> This patch align these.
>
>         - Emma Mobile EV2 pin control support
>         - R-Mobile APE6 pin control support
>         - R-Mobile A1 pin control support
>         - RZ/N1 pin control support
>         - RZ/G1H pin control support
>         - RZ/G1M pin control support
>
>         + pin control support for Emma Mobile EV2
>         + pin control support for R-Mobile APE6
>         + pin control support for R-Mobile A1
>         + pin control support for RZ/N1
>         + pin control support for RZ/G1H
>         + pin control support for RZ/G1M
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

> --- a/drivers/pinctrl/sh-pfc/Kconfig
> +++ b/drivers/pinctrl/sh-pfc/Kconfig
> @@ -56,7 +56,7 @@ config PINCTRL_SH_PFC
>           This enables pin control drivers for Renesas SuperH and ARM platforms
>
>  config PINCTRL_RZA1
> -       bool "RZ/A1 gpio and pinctrl driver"
> +       bool "gpio and pinctrl driver for RZ/A1"

Do you mind if I change this to "pinctrl support for RZ/A1" (and fix up
the sorting in 4/4), or do you insist on keeping the separation between
"gpio and pinctrl" and "pure" pinctrl drivers?

In reality, all SH, SH-Mobile, and R-Mobile pinctrl drivers are GPIO
controller drivers, too, but this is currently no reflected by their
description.

>         depends on OF
>         depends on ARCH_R7S72100 || COMPILE_TEST
>         select GPIOLIB
> @@ -67,7 +67,7 @@ config PINCTRL_RZA1
>           This selects pinctrl driver for Renesas RZ/A1 platforms.
>
>  config PINCTRL_RZA2
> -       bool "RZ/A2 gpio and pinctrl driver"
> +       bool "gpio and pinctrl driver for RZ/A2"

Likewise.

>         depends on OF
>         depends on ARCH_R7S9210 || COMPILE_TEST
>         select GPIOLIB

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 v4 2/4] pinctrl: sh-pfc: collect Renesas related CONFIGs in one place

[Geert Uytterhoeven]

Hi Morimoto-san,

On Mon, Aug 24, 2020 at 7:49 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,
> and it is confusable.
> This patch collects these into same place,
> and group into "Renesas pinctrl drivers" menu.
> This patch also moves pinctrl-rz{a1,a2,n1}.c into sh-pfc folder.
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Thank, will queue in sh-pfc-for-v5.10, with the following MAINTAINERS
update folded in:

-F:     drivers/pinctrl/pinctrl-rz*

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 v4 3/4] pinctrl: sh-pfc: align driver description title

[Kuninori Morimoto]

Hi Geert

> > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> >
> > Now, Renesas Pin Control drivers are under menu,
> > but current description are not aligned.
> > This patch align these.
> >
> >         - Emma Mobile EV2 pin control support
> >         - R-Mobile APE6 pin control support
> >         - R-Mobile A1 pin control support
> >         - RZ/N1 pin control support
> >         - RZ/G1H pin control support
> >         - RZ/G1M pin control support
> >
> >         + pin control support for Emma Mobile EV2
> >         + pin control support for R-Mobile APE6
> >         + pin control support for R-Mobile A1
> >         + pin control support for RZ/N1
> >         + pin control support for RZ/G1H
> >         + pin control support for RZ/G1M
> >
> > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> 
> > --- a/drivers/pinctrl/sh-pfc/Kconfig
> > +++ b/drivers/pinctrl/sh-pfc/Kconfig
> > @@ -56,7 +56,7 @@ config PINCTRL_SH_PFC
> >           This enables pin control drivers for Renesas SuperH and ARM platforms
> >
> >  config PINCTRL_RZA1
> > -       bool "RZ/A1 gpio and pinctrl driver"
> > +       bool "gpio and pinctrl driver for RZ/A1"
> 
> Do you mind if I change this to "pinctrl support for RZ/A1" (and fix up
> the sorting in 4/4), or do you insist on keeping the separation between
> "gpio and pinctrl" and "pure" pinctrl drivers?

I don't mind :)
Please update it


Thank you for your help !!

Best regards
---
Kuninori Morimoto

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

[Kuninori Morimoto]

Hi Geert

> > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> >
> > 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.
> > This patch also moves pinctrl-rz{a1,a2,n1}.c into sh-pfc folder.
> >
> > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> 
> Thank, will queue in sh-pfc-for-v5.10, with the following MAINTAINERS
> update folded in:
> 
> -F:     drivers/pinctrl/pinctrl-rz*

Ahh, yes, thanks.


Thank you for your help !!

Best regards
---
Kuninori Morimoto