From: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Date: Wed, 25 Mar 2026 10:23:06 +0000 (+0100)
Subject: Merge branch 'ib-scmi-pinctrl-gpio' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=541c5b0837468b433e238c3a14481f939ec978a3;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'ib-scmi-pinctrl-gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl into gpio/for-next

Pull in the SCMI GPIO driver along with its pinctrl dependencies.
---

541c5b0837468b433e238c3a14481f939ec978a3
diff --cc drivers/gpio/Kconfig
index 4294d6cbccf45,c631ecb01e070..13b36f103e5ea
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -241,9 -246,22 +241,22 @@@ config GPIO_BRCMST
  	help
  	  Say yes here to enable GPIO support for Broadcom STB (BCM7XXX) SoCs.
  
+ config GPIO_BY_PINCTRL
+ 	tristate "GPIO support based on a pure pin control backend"
+ 	depends on GPIOLIB
+ 	help
+ 	  Support for generic GPIO handling based on top of pin control.
+ 	  Traditionally, firmware creates a GPIO interface or a pin
+ 	  controller interface and we have a driver to support it.  But
+ 	  in SCMI, the pin control interface is generic and we can
+ 	  create a simple GPIO device based on the pin control interface
+ 	  without doing anything custom.
+ 
+ 	  This driver used to do GPIO over the ARM SCMI protocol.
+ 
  config GPIO_CADENCE
  	tristate "Cadence GPIO support"
 -	depends on OF_GPIO
 +	depends on OF
  	select GPIO_GENERIC
  	select GPIOLIB_IRQCHIP
  	help