Merge tag 'renesas-pinctrl-for-v5.10-tag1' of git://git.kernel.org/pub/scm/linux...

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.

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/pinctrl/Kconfig
index 029dd65,6ca1a6f..8150953
--- 1/drivers/pinctrl/Kconfig
--- 2/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

diff --cc drivers/pinctrl/Makefile
Simple merge