linux-renesas-soc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/3] pinctrl: renesas: More-consolidation
@ 2020-09-09 13:15 Geert Uytterhoeven
  2020-09-09 13:15 ` [PATCH 1/3] pinctrl: rzn1: Do not select GENERIC_PIN{CTRL_GROUPS,MUX_FUNCTIONS} Geert Uytterhoeven
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Geert Uytterhoeven @ 2020-09-09 13:15 UTC (permalink / raw)
  To: Linus Walleij
  Cc: Kuninori Morimoto, Jacopo Mondi, Chris Brandt, Gareth Williams,
	linux-gpio, linux-renesas-soc, Geert Uytterhoeven

	Hi Linus,

This patch series continues the work to consolidate all pin control
drivers for Renesas SoCs, as started by Morimoto-san.

I intend to queue this in the (new) pinctrl-renesas-for-v5.10 branch.

Thanks for your comments!

Geert Uytterhoeven (3):
  pinctrl: rzn1: Do not select GENERIC_PIN{CTRL_GROUPS,MUX_FUNCTIONS}
  pinctrl: Rename sh-pfc to renesas
  pinctrl: renesas: Reintroduce SH_PFC for common sh-pfc code

 MAINTAINERS                                   |  5 +-
 drivers/pinctrl/Kconfig                       |  2 +-
 drivers/pinctrl/Makefile                      |  2 +-
 drivers/pinctrl/{sh-pfc => renesas}/Kconfig   | 54 ++++++++++++++-----
 drivers/pinctrl/{sh-pfc => renesas}/Makefile  |  4 +-
 drivers/pinctrl/{sh-pfc => renesas}/core.c    |  0
 drivers/pinctrl/{sh-pfc => renesas}/core.h    |  0
 drivers/pinctrl/{sh-pfc => renesas}/gpio.c    |  0
 .../pinctrl/{sh-pfc => renesas}/pfc-emev2.c   |  0
 .../pinctrl/{sh-pfc => renesas}/pfc-r8a73a4.c |  0
 .../pinctrl/{sh-pfc => renesas}/pfc-r8a7740.c |  0
 .../{sh-pfc => renesas}/pfc-r8a77470.c        |  0
 .../pinctrl/{sh-pfc => renesas}/pfc-r8a7778.c |  0
 .../pinctrl/{sh-pfc => renesas}/pfc-r8a7779.c |  0
 .../pinctrl/{sh-pfc => renesas}/pfc-r8a7790.c |  0
 .../pinctrl/{sh-pfc => renesas}/pfc-r8a7791.c |  0
 .../pinctrl/{sh-pfc => renesas}/pfc-r8a7792.c |  0
 .../pinctrl/{sh-pfc => renesas}/pfc-r8a7794.c |  0
 .../{sh-pfc => renesas}/pfc-r8a77950.c        |  0
 .../{sh-pfc => renesas}/pfc-r8a77951.c        |  0
 .../pinctrl/{sh-pfc => renesas}/pfc-r8a7796.c |  2 +-
 .../{sh-pfc => renesas}/pfc-r8a77965.c        |  2 +-
 .../{sh-pfc => renesas}/pfc-r8a77970.c        |  2 +-
 .../{sh-pfc => renesas}/pfc-r8a77980.c        |  2 +-
 .../{sh-pfc => renesas}/pfc-r8a77990.c        |  2 +-
 .../{sh-pfc => renesas}/pfc-r8a77995.c        |  2 +-
 .../pinctrl/{sh-pfc => renesas}/pfc-sh7203.c  |  0
 .../pinctrl/{sh-pfc => renesas}/pfc-sh7264.c  |  0
 .../pinctrl/{sh-pfc => renesas}/pfc-sh7269.c  |  0
 .../pinctrl/{sh-pfc => renesas}/pfc-sh73a0.c  |  0
 .../pinctrl/{sh-pfc => renesas}/pfc-sh7720.c  |  0
 .../pinctrl/{sh-pfc => renesas}/pfc-sh7722.c  |  0
 .../pinctrl/{sh-pfc => renesas}/pfc-sh7723.c  |  0
 .../pinctrl/{sh-pfc => renesas}/pfc-sh7724.c  |  0
 .../pinctrl/{sh-pfc => renesas}/pfc-sh7734.c  |  0
 .../pinctrl/{sh-pfc => renesas}/pfc-sh7757.c  |  0
 .../pinctrl/{sh-pfc => renesas}/pfc-sh7785.c  |  0
 .../pinctrl/{sh-pfc => renesas}/pfc-sh7786.c  |  0
 .../pinctrl/{sh-pfc => renesas}/pfc-shx3.c    |  0
 .../{sh-pfc => renesas}/pinctrl-rza1.c        |  0
 .../{sh-pfc => renesas}/pinctrl-rza2.c        |  0
 .../{sh-pfc => renesas}/pinctrl-rzn1.c        |  0
 drivers/pinctrl/{sh-pfc => renesas}/pinctrl.c |  0
 drivers/pinctrl/{sh-pfc => renesas}/sh_pfc.h  |  0
 44 files changed, 55 insertions(+), 24 deletions(-)
 rename drivers/pinctrl/{sh-pfc => renesas}/Kconfig (90%)
 rename drivers/pinctrl/{sh-pfc => renesas}/Makefile (96%)
 rename drivers/pinctrl/{sh-pfc => renesas}/core.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/core.h (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/gpio.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-emev2.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a73a4.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7740.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77470.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7778.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7779.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7790.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7791.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7792.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7794.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77950.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77951.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7796.c (99%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77965.c (99%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77970.c (99%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77980.c (99%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77990.c (99%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77995.c (99%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7203.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7264.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7269.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh73a0.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7720.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7722.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7723.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7724.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7734.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7757.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7785.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7786.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-shx3.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pinctrl-rza1.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pinctrl-rza2.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pinctrl-rzn1.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pinctrl.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/sh_pfc.h (100%)

-- 
2.17.1

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

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH 1/3] pinctrl: rzn1: Do not select GENERIC_PIN{CTRL_GROUPS,MUX_FUNCTIONS}
  2020-09-09 13:15 [PATCH 0/3] pinctrl: renesas: More-consolidation Geert Uytterhoeven
@ 2020-09-09 13:15 ` Geert Uytterhoeven
  2020-09-09 13:15 ` [PATCH 2/3] pinctrl: Rename sh-pfc to renesas Geert Uytterhoeven
  2020-09-09 13:15 ` [PATCH 3/3] pinctrl: renesas: Reintroduce SH_PFC for common sh-pfc code Geert Uytterhoeven
  2 siblings, 0 replies; 5+ messages in thread
From: Geert Uytterhoeven @ 2020-09-09 13:15 UTC (permalink / raw)
  To: Linus Walleij
  Cc: Kuninori Morimoto, Jacopo Mondi, Chris Brandt, Gareth Williams,
	linux-gpio, linux-renesas-soc, Geert Uytterhoeven

The RZ/N1 pin control driver does not use pin groups or pin functions,
so there is no need to select GENERIC_PINCTRL_GROUPS or
GENERIC_PINMUX_FUNCTIONS.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/pinctrl/sh-pfc/Kconfig | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/pinctrl/sh-pfc/Kconfig b/drivers/pinctrl/sh-pfc/Kconfig
index 2cff88684f364a39..9eb793cb464b8806 100644
--- a/drivers/pinctrl/sh-pfc/Kconfig
+++ b/drivers/pinctrl/sh-pfc/Kconfig
@@ -179,8 +179,6 @@ 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.
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH 2/3] pinctrl: Rename sh-pfc to renesas
  2020-09-09 13:15 [PATCH 0/3] pinctrl: renesas: More-consolidation Geert Uytterhoeven
  2020-09-09 13:15 ` [PATCH 1/3] pinctrl: rzn1: Do not select GENERIC_PIN{CTRL_GROUPS,MUX_FUNCTIONS} Geert Uytterhoeven
@ 2020-09-09 13:15 ` Geert Uytterhoeven
  2020-09-15  8:03   ` Geert Uytterhoeven
  2020-09-09 13:15 ` [PATCH 3/3] pinctrl: renesas: Reintroduce SH_PFC for common sh-pfc code Geert Uytterhoeven
  2 siblings, 1 reply; 5+ messages in thread
From: Geert Uytterhoeven @ 2020-09-09 13:15 UTC (permalink / raw)
  To: Linus Walleij
  Cc: Kuninori Morimoto, Jacopo Mondi, Chris Brandt, Gareth Williams,
	linux-gpio, linux-renesas-soc, Geert Uytterhoeven

The drivers/pinctrl/sh-pfc subdirectory was originally created to group
pin control drivers for various Renesas SuperH and SH-Mobile platforms.
However, the name "sh-pfc" no longer reflects its contents, as the
directory now contains pin control drivers for Renesas SuperH, ARM32,
and ARM64 SoCs.

Hence rename the subdirectory from drivers/pinctrl/sh-pfc to
drivers/pinctrl/renesas, and the related Kconfig symbol from
PINCTRL_SH_PFC to PINCTRL_RENESAS.

Rename the git branch in MAINTAINERS, too, for consistency.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 MAINTAINERS                                        | 5 +++--
 drivers/pinctrl/Kconfig                            | 2 +-
 drivers/pinctrl/Makefile                           | 2 +-
 drivers/pinctrl/{sh-pfc => renesas}/Kconfig        | 2 +-
 drivers/pinctrl/{sh-pfc => renesas}/Makefile       | 4 ++--
 drivers/pinctrl/{sh-pfc => renesas}/core.c         | 0
 drivers/pinctrl/{sh-pfc => renesas}/core.h         | 0
 drivers/pinctrl/{sh-pfc => renesas}/gpio.c         | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-emev2.c    | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a73a4.c  | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7740.c  | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77470.c | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7778.c  | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7779.c  | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7790.c  | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7791.c  | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7792.c  | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7794.c  | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77950.c | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77951.c | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7796.c  | 2 +-
 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77965.c | 2 +-
 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77970.c | 2 +-
 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77980.c | 2 +-
 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77990.c | 2 +-
 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77995.c | 2 +-
 drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7203.c   | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7264.c   | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7269.c   | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-sh73a0.c   | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7720.c   | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7722.c   | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7723.c   | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7724.c   | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7734.c   | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7757.c   | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7785.c   | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7786.c   | 0
 drivers/pinctrl/{sh-pfc => renesas}/pfc-shx3.c     | 0
 drivers/pinctrl/{sh-pfc => renesas}/pinctrl-rza1.c | 0
 drivers/pinctrl/{sh-pfc => renesas}/pinctrl-rza2.c | 0
 drivers/pinctrl/{sh-pfc => renesas}/pinctrl-rzn1.c | 0
 drivers/pinctrl/{sh-pfc => renesas}/pinctrl.c      | 0
 drivers/pinctrl/{sh-pfc => renesas}/sh_pfc.h       | 0
 44 files changed, 14 insertions(+), 13 deletions(-)
 rename drivers/pinctrl/{sh-pfc => renesas}/Kconfig (99%)
 rename drivers/pinctrl/{sh-pfc => renesas}/Makefile (96%)
 rename drivers/pinctrl/{sh-pfc => renesas}/core.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/core.h (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/gpio.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-emev2.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a73a4.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7740.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77470.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7778.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7779.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7790.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7791.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7792.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7794.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77950.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77951.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7796.c (99%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77965.c (99%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77970.c (99%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77980.c (99%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77990.c (99%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77995.c (99%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7203.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7264.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7269.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh73a0.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7720.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7722.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7723.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7724.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7734.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7757.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7785.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7786.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pfc-shx3.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pinctrl-rza1.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pinctrl-rza2.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pinctrl-rzn1.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/pinctrl.c (100%)
 rename drivers/pinctrl/{sh-pfc => renesas}/sh_pfc.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 73242e16e327b311..6ac6c8f71037d797 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13688,9 +13688,10 @@ PIN CONTROLLER - RENESAS
 M:	Geert Uytterhoeven <geert+renesas@glider.be>
 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
+T:	git
+git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas
 F:	Documentation/devicetree/bindings/pinctrl/renesas,*
-F:	drivers/pinctrl/sh-pfc/
+F:	drivers/pinctrl/renesas/
 
 PIN CONTROLLER - SAMSUNG
 M:	Tomasz Figa <tomasz.figa@gmail.com>
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index f63c5a04a3f72a68..6ca1a6fc9756922b 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -383,8 +383,8 @@ source "drivers/pinctrl/nomadik/Kconfig"
 source "drivers/pinctrl/nuvoton/Kconfig"
 source "drivers/pinctrl/pxa/Kconfig"
 source "drivers/pinctrl/qcom/Kconfig"
+source "drivers/pinctrl/renesas/Kconfig"
 source "drivers/pinctrl/samsung/Kconfig"
-source "drivers/pinctrl/sh-pfc/Kconfig"
 source "drivers/pinctrl/spear/Kconfig"
 source "drivers/pinctrl/sprd/Kconfig"
 source "drivers/pinctrl/stm32/Kconfig"
diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index 1da9f28aecbd34d6..113be648658f3d9c 100644
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -59,8 +59,8 @@ obj-y				+= nomadik/
 obj-$(CONFIG_ARCH_NPCM7XX)	+= nuvoton/
 obj-$(CONFIG_PINCTRL_PXA)	+= pxa/
 obj-$(CONFIG_ARCH_QCOM)		+= qcom/
+obj-$(CONFIG_PINCTRL_RENESAS)	+= renesas/
 obj-$(CONFIG_PINCTRL_SAMSUNG)	+= samsung/
-obj-$(CONFIG_PINCTRL_SH_PFC)	+= sh-pfc/
 obj-$(CONFIG_PINCTRL_SPEAR)	+= spear/
 obj-y				+= sprd/
 obj-$(CONFIG_PINCTRL_STM32)	+= stm32/
diff --git a/drivers/pinctrl/sh-pfc/Kconfig b/drivers/pinctrl/renesas/Kconfig
similarity index 99%
rename from drivers/pinctrl/sh-pfc/Kconfig
rename to drivers/pinctrl/renesas/Kconfig
index 9eb793cb464b8806..fc1f2611063b0cd6 100644
--- a/drivers/pinctrl/sh-pfc/Kconfig
+++ b/drivers/pinctrl/renesas/Kconfig
@@ -5,7 +5,7 @@
 
 menu "Renesas pinctrl drivers"
 
-config PINCTRL_SH_PFC
+config PINCTRL_RENESAS
 	bool "Renesas SoC pin control support" if COMPILE_TEST && !(ARCH_RENESAS || SUPERH)
 	default y if ARCH_RENESAS || SUPERH
 	select PINMUX
diff --git a/drivers/pinctrl/sh-pfc/Makefile b/drivers/pinctrl/renesas/Makefile
similarity index 96%
rename from drivers/pinctrl/sh-pfc/Makefile
rename to drivers/pinctrl/renesas/Makefile
index 0b5640cf457b4e42..c96008c9ab59c175 100644
--- a/drivers/pinctrl/sh-pfc/Makefile
+++ b/drivers/pinctrl/renesas/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_PINCTRL_SH_PFC)	+= core.o pinctrl.o
+obj-$(CONFIG_PINCTRL_RENESAS)		+= core.o pinctrl.o
 obj-$(CONFIG_PINCTRL_SH_PFC_GPIO)	+= gpio.o
-obj-$(CONFIG_PINCTRL_PFC_EMEV2)	+= pfc-emev2.o
+obj-$(CONFIG_PINCTRL_PFC_EMEV2)		+= pfc-emev2.o
 obj-$(CONFIG_PINCTRL_PFC_R8A73A4)	+= pfc-r8a73a4.o
 obj-$(CONFIG_PINCTRL_PFC_R8A7740)	+= pfc-r8a7740.o
 obj-$(CONFIG_PINCTRL_PFC_R8A7742)	+= pfc-r8a7790.o
diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/renesas/core.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/core.c
rename to drivers/pinctrl/renesas/core.c
diff --git a/drivers/pinctrl/sh-pfc/core.h b/drivers/pinctrl/renesas/core.h
similarity index 100%
rename from drivers/pinctrl/sh-pfc/core.h
rename to drivers/pinctrl/renesas/core.h
diff --git a/drivers/pinctrl/sh-pfc/gpio.c b/drivers/pinctrl/renesas/gpio.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/gpio.c
rename to drivers/pinctrl/renesas/gpio.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-emev2.c b/drivers/pinctrl/renesas/pfc-emev2.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-emev2.c
rename to drivers/pinctrl/renesas/pfc-emev2.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c b/drivers/pinctrl/renesas/pfc-r8a73a4.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
rename to drivers/pinctrl/renesas/pfc-r8a73a4.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c b/drivers/pinctrl/renesas/pfc-r8a7740.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-r8a7740.c
rename to drivers/pinctrl/renesas/pfc-r8a7740.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77470.c b/drivers/pinctrl/renesas/pfc-r8a77470.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-r8a77470.c
rename to drivers/pinctrl/renesas/pfc-r8a77470.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7778.c b/drivers/pinctrl/renesas/pfc-r8a7778.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-r8a7778.c
rename to drivers/pinctrl/renesas/pfc-r8a7778.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c b/drivers/pinctrl/renesas/pfc-r8a7779.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-r8a7779.c
rename to drivers/pinctrl/renesas/pfc-r8a7779.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c b/drivers/pinctrl/renesas/pfc-r8a7790.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-r8a7790.c
rename to drivers/pinctrl/renesas/pfc-r8a7790.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c b/drivers/pinctrl/renesas/pfc-r8a7791.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-r8a7791.c
rename to drivers/pinctrl/renesas/pfc-r8a7791.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7792.c b/drivers/pinctrl/renesas/pfc-r8a7792.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-r8a7792.c
rename to drivers/pinctrl/renesas/pfc-r8a7792.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7794.c b/drivers/pinctrl/renesas/pfc-r8a7794.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-r8a7794.c
rename to drivers/pinctrl/renesas/pfc-r8a7794.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77950.c b/drivers/pinctrl/renesas/pfc-r8a77950.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-r8a77950.c
rename to drivers/pinctrl/renesas/pfc-r8a77950.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77951.c b/drivers/pinctrl/renesas/pfc-r8a77951.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-r8a77951.c
rename to drivers/pinctrl/renesas/pfc-r8a77951.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7796.c b/drivers/pinctrl/renesas/pfc-r8a7796.c
similarity index 99%
rename from drivers/pinctrl/sh-pfc/pfc-r8a7796.c
rename to drivers/pinctrl/renesas/pfc-r8a7796.c
index a2496baca85d23f8..55f0344a3d3e9af6 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7796.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7796.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2016-2019 Renesas Electronics Corp.
  *
- * This file is based on the drivers/pinctrl/sh-pfc/pfc-r8a7795.c
+ * This file is based on the drivers/pinctrl/renesas/pfc-r8a7795.c
  *
  * R-Car Gen3 processor support - PFC hardware block.
  *
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77965.c b/drivers/pinctrl/renesas/pfc-r8a77965.c
similarity index 99%
rename from drivers/pinctrl/sh-pfc/pfc-r8a77965.c
rename to drivers/pinctrl/renesas/pfc-r8a77965.c
index 6616f5210b9d96d4..7a50b9b69a7dc4e3 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a77965.c
+++ b/drivers/pinctrl/renesas/pfc-r8a77965.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2018 Jacopo Mondi <jacopo+renesas@jmondi.org>
  * Copyright (C) 2016-2019 Renesas Electronics Corp.
  *
- * This file is based on the drivers/pinctrl/sh-pfc/pfc-r8a7796.c
+ * This file is based on the drivers/pinctrl/renesas/pfc-r8a7796.c
  *
  * R-Car Gen3 processor support - PFC hardware block.
  *
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77970.c b/drivers/pinctrl/renesas/pfc-r8a77970.c
similarity index 99%
rename from drivers/pinctrl/sh-pfc/pfc-r8a77970.c
rename to drivers/pinctrl/renesas/pfc-r8a77970.c
index 9f7d9c9238fcc9d9..e8a0fc468eb260c6 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a77970.c
+++ b/drivers/pinctrl/renesas/pfc-r8a77970.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2016 Renesas Electronics Corp.
  * Copyright (C) 2017 Cogent Embedded, Inc. <source@cogentembedded.com>
  *
- * This file is based on the drivers/pinctrl/sh-pfc/pfc-r8a7795.c
+ * This file is based on the drivers/pinctrl/renesas/pfc-r8a7795.c
  *
  * R-Car Gen3 processor support - PFC hardware block.
  *
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77980.c b/drivers/pinctrl/renesas/pfc-r8a77980.c
similarity index 99%
rename from drivers/pinctrl/sh-pfc/pfc-r8a77980.c
rename to drivers/pinctrl/renesas/pfc-r8a77980.c
index 1055f98534049e6d..ebd07bebaeebca07 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a77980.c
+++ b/drivers/pinctrl/renesas/pfc-r8a77980.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2018 Renesas Electronics Corp.
  * Copyright (C) 2018 Cogent Embedded, Inc.
  *
- * This file is based on the drivers/pinctrl/sh-pfc/pfc-r8a7795.c
+ * This file is based on the drivers/pinctrl/renesas/pfc-r8a7795.c
  *
  * R-Car Gen3 processor support - PFC hardware block.
  *
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77990.c b/drivers/pinctrl/renesas/pfc-r8a77990.c
similarity index 99%
rename from drivers/pinctrl/sh-pfc/pfc-r8a77990.c
rename to drivers/pinctrl/renesas/pfc-r8a77990.c
index c926a59dd21ceadc..aed04a4c61163cb2 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a77990.c
+++ b/drivers/pinctrl/renesas/pfc-r8a77990.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2018-2019 Renesas Electronics Corp.
  *
- * This file is based on the drivers/pinctrl/sh-pfc/pfc-r8a7796.c
+ * This file is based on the drivers/pinctrl/renesas/pfc-r8a7796.c
  *
  * R8A7796 processor support - PFC hardware block.
  *
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77995.c b/drivers/pinctrl/renesas/pfc-r8a77995.c
similarity index 99%
rename from drivers/pinctrl/sh-pfc/pfc-r8a77995.c
rename to drivers/pinctrl/renesas/pfc-r8a77995.c
index c10b756476b142e6..672251d86c2de3cd 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a77995.c
+++ b/drivers/pinctrl/renesas/pfc-r8a77995.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2017 Renesas Electronics Corp.
  *
- * This file is based on the drivers/pinctrl/sh-pfc/pfc-r8a7796.c
+ * This file is based on the drivers/pinctrl/renesas/pfc-r8a7796.c
  *
  * R-Car Gen3 processor support - PFC hardware block.
  *
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7203.c b/drivers/pinctrl/renesas/pfc-sh7203.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-sh7203.c
rename to drivers/pinctrl/renesas/pfc-sh7203.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7264.c b/drivers/pinctrl/renesas/pfc-sh7264.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-sh7264.c
rename to drivers/pinctrl/renesas/pfc-sh7264.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7269.c b/drivers/pinctrl/renesas/pfc-sh7269.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-sh7269.c
rename to drivers/pinctrl/renesas/pfc-sh7269.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh73a0.c b/drivers/pinctrl/renesas/pfc-sh73a0.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-sh73a0.c
rename to drivers/pinctrl/renesas/pfc-sh73a0.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7720.c b/drivers/pinctrl/renesas/pfc-sh7720.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-sh7720.c
rename to drivers/pinctrl/renesas/pfc-sh7720.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7722.c b/drivers/pinctrl/renesas/pfc-sh7722.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-sh7722.c
rename to drivers/pinctrl/renesas/pfc-sh7722.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7723.c b/drivers/pinctrl/renesas/pfc-sh7723.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-sh7723.c
rename to drivers/pinctrl/renesas/pfc-sh7723.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7724.c b/drivers/pinctrl/renesas/pfc-sh7724.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-sh7724.c
rename to drivers/pinctrl/renesas/pfc-sh7724.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7734.c b/drivers/pinctrl/renesas/pfc-sh7734.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-sh7734.c
rename to drivers/pinctrl/renesas/pfc-sh7734.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7757.c b/drivers/pinctrl/renesas/pfc-sh7757.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-sh7757.c
rename to drivers/pinctrl/renesas/pfc-sh7757.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7785.c b/drivers/pinctrl/renesas/pfc-sh7785.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-sh7785.c
rename to drivers/pinctrl/renesas/pfc-sh7785.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7786.c b/drivers/pinctrl/renesas/pfc-sh7786.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-sh7786.c
rename to drivers/pinctrl/renesas/pfc-sh7786.c
diff --git a/drivers/pinctrl/sh-pfc/pfc-shx3.c b/drivers/pinctrl/renesas/pfc-shx3.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-shx3.c
rename to drivers/pinctrl/renesas/pfc-shx3.c
diff --git a/drivers/pinctrl/sh-pfc/pinctrl-rza1.c b/drivers/pinctrl/renesas/pinctrl-rza1.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pinctrl-rza1.c
rename to drivers/pinctrl/renesas/pinctrl-rza1.c
diff --git a/drivers/pinctrl/sh-pfc/pinctrl-rza2.c b/drivers/pinctrl/renesas/pinctrl-rza2.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pinctrl-rza2.c
rename to drivers/pinctrl/renesas/pinctrl-rza2.c
diff --git a/drivers/pinctrl/sh-pfc/pinctrl-rzn1.c b/drivers/pinctrl/renesas/pinctrl-rzn1.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pinctrl-rzn1.c
rename to drivers/pinctrl/renesas/pinctrl-rzn1.c
diff --git a/drivers/pinctrl/sh-pfc/pinctrl.c b/drivers/pinctrl/renesas/pinctrl.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pinctrl.c
rename to drivers/pinctrl/renesas/pinctrl.c
diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h b/drivers/pinctrl/renesas/sh_pfc.h
similarity index 100%
rename from drivers/pinctrl/sh-pfc/sh_pfc.h
rename to drivers/pinctrl/renesas/sh_pfc.h
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH 3/3] pinctrl: renesas: Reintroduce SH_PFC for common sh-pfc code
  2020-09-09 13:15 [PATCH 0/3] pinctrl: renesas: More-consolidation Geert Uytterhoeven
  2020-09-09 13:15 ` [PATCH 1/3] pinctrl: rzn1: Do not select GENERIC_PIN{CTRL_GROUPS,MUX_FUNCTIONS} Geert Uytterhoeven
  2020-09-09 13:15 ` [PATCH 2/3] pinctrl: Rename sh-pfc to renesas Geert Uytterhoeven
@ 2020-09-09 13:15 ` Geert Uytterhoeven
  2 siblings, 0 replies; 5+ messages in thread
From: Geert Uytterhoeven @ 2020-09-09 13:15 UTC (permalink / raw)
  To: Linus Walleij
  Cc: Kuninori Morimoto, Jacopo Mondi, Chris Brandt, Gareth Williams,
	linux-gpio, linux-renesas-soc, Geert Uytterhoeven

Most, but not all, Renesas pin control drivers use the "sh-pfc" pin
control framework.  As of commit 8449bfa9e6a9f7ec ("pinctrl: sh-pfc:
Collect Renesas related CONFIGs in one place"), the code for this
framework is always built when Renesas SoC pin control support is
enabled, regardless of whether the enabled pin control drivers need it
or not.

Fix this by reintroducing the CONFIG_SH_PFC symbol to control inclusion
of the "sh-pfc" framework and its dependencies, and selecting it when
needed.

This reduces kernel size of a typical RZ/A1 or RZ/A2 kernel by more than
6 resp. 11 KiB.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/pinctrl/renesas/Kconfig  | 50 ++++++++++++++++++++++++++------
 drivers/pinctrl/renesas/Makefile |  2 +-
 2 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/drivers/pinctrl/renesas/Kconfig b/drivers/pinctrl/renesas/Kconfig
index fc1f2611063b0cd6..e941b8440dbc8361 100644
--- a/drivers/pinctrl/renesas/Kconfig
+++ b/drivers/pinctrl/renesas/Kconfig
@@ -8,9 +8,6 @@ menu "Renesas pinctrl drivers"
 config PINCTRL_RENESAS
 	bool "Renesas SoC pin control support" if COMPILE_TEST && !(ARCH_RENESAS || SUPERH)
 	default y if ARCH_RENESAS || SUPERH
-	select PINMUX
-	select PINCONF
-	select GENERIC_PINCONF
 	select PINCTRL_PFC_EMEV2 if ARCH_EMEV2
 	select PINCTRL_PFC_R8A73A4 if ARCH_R8A73A4
 	select PINCTRL_PFC_R8A7740 if ARCH_R8A7740
@@ -55,68 +52,95 @@ config PINCTRL_RENESAS
 	help
 	  This enables pin control drivers for Renesas SuperH and ARM platforms
 
+config PINCTRL_SH_PFC
+	bool
+	select GENERIC_PINCONF
+	select PINMUX
+	select PINCONF
+	help
+	  This enables common pin control functionality for EMMA Mobile, R-Car,
+	  R-Mobile, RZ/G, SH, and SH-Mobile platforms.
+
 config PINCTRL_SH_PFC_GPIO
-	select GPIOLIB
 	bool
+	select GPIOLIB
+	select PINCTRL_SH_PFC
 	help
 	  This enables pin control and GPIO drivers for SH/SH Mobile platforms
 
 config PINCTRL_SH_FUNC_GPIO
-	select PINCTRL_SH_PFC_GPIO
 	bool
+	select PINCTRL_SH_PFC_GPIO
 	help
 	  This enables legacy function GPIOs for SH platforms
 
 config PINCTRL_PFC_EMEV2
 	bool "pin control support for Emma Mobile EV2" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A77995
 	bool "pin control support for R-Car D3" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A7794
 	bool "pin control support for R-Car E2" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A77990
 	bool "pin control support for R-Car E3" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A7779
 	bool "pin control support for R-Car H1" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A7790
 	bool "pin control support for R-Car H2" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A77950
 	bool "pin control support for R-Car H3 ES1.x" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A77951
 	bool "pin control support for R-Car H3 ES2.0+" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A7778
 	bool "pin control support for R-Car M1A" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A7793
 	bool "pin control support for R-Car M2-N" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A7791
 	bool "pin control support for R-Car M2-W" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A77965
 	bool "pin control support for R-Car M3-N" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A77960
 	bool "pin control support for R-Car M3-W" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A77961
 	bool "pin control support for R-Car M3-W+" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A7792
 	bool "pin control support for R-Car V2H" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A77980
 	bool "pin control support for R-Car V3H" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A77970
 	bool "pin control support for R-Car V3M" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A7740
 	bool "pin control support for R-Mobile A1" if COMPILE_TEST
@@ -130,10 +154,10 @@ config PINCTRL_RZA1
 	bool "pin control support for RZ/A1"
 	depends on OF
 	depends on ARCH_R7S72100 || COMPILE_TEST
-	select GPIOLIB
+	select GENERIC_PINCONF
 	select GENERIC_PINCTRL_GROUPS
 	select GENERIC_PINMUX_FUNCTIONS
-	select GENERIC_PINCONF
+	select GPIOLIB
 	help
 	  This selects pinctrl driver for Renesas RZ/A1 platforms.
 
@@ -141,39 +165,47 @@ config PINCTRL_RZA2
 	bool "pin control support for RZ/A2"
 	depends on OF
 	depends on ARCH_R7S9210 || COMPILE_TEST
-	select GPIOLIB
 	select GENERIC_PINCTRL_GROUPS
 	select GENERIC_PINMUX_FUNCTIONS
-	select GENERIC_PINCONF
+	select GPIOLIB
 	help
 	  This selects GPIO and pinctrl driver for Renesas RZ/A2 platforms.
 
 config PINCTRL_PFC_R8A77470
 	bool "pin control support for RZ/G1C" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A7745
 	bool "pin control support for RZ/G1E" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A7742
 	bool "pin control support for RZ/G1H" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A7743
 	bool "pin control support for RZ/G1M" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A7744
 	bool "pin control support for RZ/G1N" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A774C0
 	bool "pin control support for RZ/G2E" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A774E1
 	bool "pin control support for RZ/G2H" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A774A1
 	bool "pin control support for RZ/G2M" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_PFC_R8A774B1
 	bool "pin control support for RZ/G2N" if COMPILE_TEST
+	select PINCTRL_SH_PFC
 
 config PINCTRL_RZN1
 	bool "pin control support for RZ/N1"
diff --git a/drivers/pinctrl/renesas/Makefile b/drivers/pinctrl/renesas/Makefile
index c96008c9ab59c175..1f6d7dd019d8e76f 100644
--- a/drivers/pinctrl/renesas/Makefile
+++ b/drivers/pinctrl/renesas/Makefile
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_PINCTRL_RENESAS)		+= core.o pinctrl.o
+obj-$(CONFIG_PINCTRL_SH_PFC)		+= core.o pinctrl.o
 obj-$(CONFIG_PINCTRL_SH_PFC_GPIO)	+= gpio.o
 obj-$(CONFIG_PINCTRL_PFC_EMEV2)		+= pfc-emev2.o
 obj-$(CONFIG_PINCTRL_PFC_R8A73A4)	+= pfc-r8a73a4.o
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH 2/3] pinctrl: Rename sh-pfc to renesas
  2020-09-09 13:15 ` [PATCH 2/3] pinctrl: Rename sh-pfc to renesas Geert Uytterhoeven
@ 2020-09-15  8:03   ` Geert Uytterhoeven
  0 siblings, 0 replies; 5+ messages in thread
From: Geert Uytterhoeven @ 2020-09-15  8:03 UTC (permalink / raw)
  To: Linus Walleij
  Cc: Kuninori Morimoto, Jacopo Mondi, Chris Brandt, Gareth Williams,
	open list:GPIO SUBSYSTEM, Linux-Renesas, Geert Uytterhoeven

On Wed, Sep 9, 2020 at 6:26 PM Geert Uytterhoeven
<geert+renesas@glider.be> wrote:
> The drivers/pinctrl/sh-pfc subdirectory was originally created to group
> pin control drivers for various Renesas SuperH and SH-Mobile platforms.
> However, the name "sh-pfc" no longer reflects its contents, as the
> directory now contains pin control drivers for Renesas SuperH, ARM32,
> and ARM64 SoCs.
>
> Hence rename the subdirectory from drivers/pinctrl/sh-pfc to
> drivers/pinctrl/renesas, and the related Kconfig symbol from
> PINCTRL_SH_PFC to PINCTRL_RENESAS.
>
> Rename the git branch in MAINTAINERS, too, for consistency.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -13688,9 +13688,10 @@ PIN CONTROLLER - RENESAS
>  M:     Geert Uytterhoeven <geert+renesas@glider.be>
>  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
> +T:     git

Obviously this line must not be split here.

> +git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas

While applying, I'm renaming this to "renesas-pinctrl", for consistency
with my branches for arm-soc, and with what other people are doing.

>  F:     Documentation/devicetree/bindings/pinctrl/renesas,*
> -F:     drivers/pinctrl/sh-pfc/
> +F:     drivers/pinctrl/renesas/
>
>  PIN CONTROLLER - SAMSUNG
>  M:     Tomasz Figa <tomasz.figa@gmail.com>

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

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-09-15  8:04 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-09 13:15 [PATCH 0/3] pinctrl: renesas: More-consolidation Geert Uytterhoeven
2020-09-09 13:15 ` [PATCH 1/3] pinctrl: rzn1: Do not select GENERIC_PIN{CTRL_GROUPS,MUX_FUNCTIONS} Geert Uytterhoeven
2020-09-09 13:15 ` [PATCH 2/3] pinctrl: Rename sh-pfc to renesas Geert Uytterhoeven
2020-09-15  8:03   ` Geert Uytterhoeven
2020-09-09 13:15 ` [PATCH 3/3] pinctrl: renesas: Reintroduce SH_PFC for common sh-pfc code Geert Uytterhoeven

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).