From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Sep 2021 21:22:56 +0000 (-0700)
Subject: Merge tag 'pinctrl-v5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c793011242d182e5f12800c12dbaf37af80be735;p=linux.git

Merge tag 'pinctrl-v5.15-1' of git://git./linux/kernel/git/linusw/linux-pinctrl

Pull pin control updates from Linus Walleij:
 "This is the bulk of pin control changes for the v5.15 kernel cycle, no
  core changes at all this time, just driver work!

  New drivers:

   - New subdriver for Intel Keem Bay (an ARM-based SoC)

   - New subdriver for Qualcomm MDM9607 and SM6115

   - New subdriver for ST Microelectronics STM32MP135

   - New subdriver for Freescale i.MX8ULP ("Ultra Low Power")

   - New subdriver for Ingenic X2100

   - Support for Qualcomm PMC8180, PMC8180C, SA8155p-adp PMIC GPIO

   - Support Samsung Exynos850

   - Support Renesas RZ/G2L

  Enhancements:

   - A major refactoring of the Rockchip driver, breaking part of it out
     to a separate GPIO driver in drivers/gpio

   - Pin bias support on Renesas r8a77995

   - Add SCI pins support to Ingenic JZ4755 and JZ4760

   - Mediatek device tree bindings converted to YAML"

* tag 'pinctrl-v5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (53 commits)
  pinctrl: renesas: Add RZ/G2L pin and gpio controller driver
  pinctrl: samsung: Add Exynos850 SoC specific data
  dt-bindings: pinctrl: samsung: Add Exynos850 doc
  MAINTAINERS: Add maintainers for amd-pinctrl driver
  pinctrl: Add Intel Keem Bay pinctrl driver
  dt-bindings: pinctrl: Add bindings for Intel Keembay pinctrl driver
  pinctrl: zynqmp: Drop pinctrl_unregister for devm_ registered device
  dt-bindings: pinctrl: qcom-pmic-gpio: Remove the interrupts property
  dt-bindings: pinctrl: qcom-pmic-gpio: Convert qcom pmic gpio bindings to YAML
  dt-bindings: pinctrl: mt8195: Use real world values for drive-strength arguments
  dt-bindings: mediatek: convert pinctrl to yaml
  arm: dts: mt8183: Move pinfunc to include/dt-bindings/pinctrl
  arm: dts: mt8135: Move pinfunc to include/dt-bindings/pinctrl
  pinctrl: ingenic: Add .max_register in regmap_config
  pinctrl: ingenic: Fix bias config for X2000(E)
  pinctrl: ingenic: Fix incorrect pull up/down info
  pinctrl: Ingenic: Add pinctrl driver for X2100.
  dt-bindings: pinctrl: Add bindings for Ingenic X2100.
  pinctrl: Ingenic: Add SSI pins support for JZ4755 and JZ4760.
  pinctrl: Ingenic: Improve the code.
  ...
---

c793011242d182e5f12800c12dbaf37af80be735
diff --cc drivers/pinctrl/qcom/Kconfig
index cad4e60df618c,2bc6206555506..32ea2a8ec02b5
--- a/drivers/pinctrl/qcom/Kconfig
+++ b/drivers/pinctrl/qcom/Kconfig
@@@ -88,9 -88,17 +88,17 @@@ config PINCTRL_MSM896
  	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
  	  Qualcomm TLMM block found in the Qualcomm 8960 platform.
  
+ config PINCTRL_MDM9607
+ 	tristate "Qualcomm 9607 pin controller driver"
+ 	depends on GPIOLIB && OF
+ 	depends on PINCTRL_MSM
+ 	help
+ 	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+ 	  Qualcomm TLMM block found in the Qualcomm 9607 platform.
+ 
  config PINCTRL_MDM9615
  	tristate "Qualcomm 9615 pin controller driver"
 -	depends on GPIOLIB && OF
 +	depends on OF
  	depends on PINCTRL_MSM
  	help
  	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
@@@ -256,9 -264,18 +264,18 @@@ config PINCTRL_SDX5
  	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
  	 Technologies Inc SDX55 platform.
  
+ config PINCTRL_SM6115
+ 	tristate "Qualcomm Technologies Inc SM6115,SM4250 pin controller driver"
+ 	depends on GPIOLIB && OF
+ 	depends on PINCTRL_MSM
+ 	help
+ 	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+ 	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
+ 	 Technologies Inc SM6115 and SM4250 platforms.
+ 
  config PINCTRL_SM6125
  	tristate "Qualcomm Technologies Inc SM6125 pin controller driver"
 -	depends on GPIOLIB && OF
 +	depends on OF
  	depends on PINCTRL_MSM
  	help
  	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the