From: Linus Walleij <linus.walleij@linaro.org>
Date: Mon, 21 Sep 2020 21:43:30 +0000 (+0200)
Subject: Merge tag 'renesas-pinctrl-for-v5.10-tag1' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v5.15~2682^2~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e777f8c8f9f6a3fe4f42f5f101620adc60b78616;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'renesas-pinctrl-for-v5.10-tag1' of git://git./linux/kernel/git/geert/renesas-drivers into devel

pinctrl: renesas: Updates for v5.10

  - Add CAN and USB1 PWEN pin groups on R-Car H2 and RZ/G1,
  - Three more conversion of DT bindings to json-schema,
  - Group all Renesas pinctrl drivers and improve visual Kconfig
    structure,
  - Rename drivers/pinctrl/sh-pfc to drivers/pinctrl/renesas,
  - Minor fixes and improvements.
---

e777f8c8f9f6a3fe4f42f5f101620adc60b78616
diff --cc drivers/pinctrl/Kconfig
index 029dd65,6ca1a6f..8150953
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@@ -213,40 -212,7 +213,8 @@@ config PINCTRL_ROCKCHI
  	select GENERIC_PINCONF
  	select GENERIC_IRQ_CHIP
  	select MFD_SYSCON
 +	select OF_GPIO
  
- 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