pinctrl: sh-pfc: Collect Renesas related CONFIGs in one place

Renesas related pinctrl CONFIGs are located in many places, which is
confusing.
This patch collects them into the same place, grouped in a new "Renesas
pinctrl drivers" menu.
This patch also moves pinctrl-rz{a1,a2,n1}.c into the sh-pfc folder.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87k0xoy4r7.wl-kuninori.morimoto.gx@renesas.com
[geert: Update path in MAINTAINERS]
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

diff --git a/MAINTAINERS b/MAINTAINERS
index deaafb617361c7ecb212620b1deac942f03588f1..73242e16e327b311c0f98d79004a8d60e92c2783 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13690,7 +13690,6 @@ L:      linux-renesas-soc@vger.kernel.org
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc
 F:     Documentation/devicetree/bindings/pinctrl/renesas,*
-F:     drivers/pinctrl/pinctrl-rz*
 F:     drivers/pinctrl/sh-pfc/
 
 PIN CONTROLLER - SAMSUNG

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 8828613c4e0e2ce0db71332b605b8ba50871b67c..f63c5a04a3f72a68207f268134b7761e9ee6e5d3 100644 (file)
--- 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 1731b2154df9f4b9f960b0b0730a2fb29bdc561e..1da9f28aecbd34d650a0efb862b5b3b367073cdf 100644 (file)
--- 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 8b2b1e1a904774b087ac729f7c34ec709aa3e448..ff10bb2ed4975d0bff9c6e2c4fdb22e8ead8d1b2 100644 (file)
--- 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 7bb99187cd8eea6a7a0d74dba5f17fc726e59ad7..0b5640cf457b4e42114c6628e45d561d7727234c 100644 (file)
--- 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 511f232ab7bc290c67469ad35f170ca492707f6c..a0cb586a46b762dfb628a29157a4e2f1ffcaef27 100644 (file)
--- 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 c5bf98c86b2b369d5f2de20609717aebbdd3fdae..32829eb9656c9d31f3d144ebee911b1ba5bf93c5 100644 (file)
--- 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 39538d40dbf321ed9337db911ea6cd3029748a33..ef5fb25b6016dd3136cf1ea38fa9b1edbcf6ccff 100644 (file)
--- 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