From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 2 Sep 2021 03:13:04 +0000 (+1000)
Subject: Merge remote-tracking branch 'pinctrl/for-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=eb8bfcc7af46326b7b043366713c4f9d16b4b92e;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'pinctrl/for-next'
---

eb8bfcc7af46326b7b043366713c4f9d16b4b92e
diff --cc drivers/pinctrl/qcom/Kconfig
index cad4e60df618,2bc620655550..32ea2a8ec02b
--- 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