Merge "pinctrl: qcom: Add support for Cliffs SoC in pin control"

drivers/pinctrl/qcom/Kconfig

@@ -23,6 +23,17 @@ config PINCTRL_PINEAPPLE
 	  Say Y here to compile statically, or M here to compile it as a
 	  module. If unsure, say N.
 
+config PINCTRL_CLIFFS
+	tristate "Qualcomm Technologies, Inc. CLIFFS pin controller driver"
+	depends on GPIOLIB && OF
+	select PINCTRL_MSM
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm Technologies Inc Top Level Mode Multiplexer block (TLMM)
+	  block found on the Qualcomm Technologies Inc CLIFFS platform.
+	  Say Y here to compile statically, or M here to compile it as a
+	  module. If unsure, say N.
+
 config PINCTRL_KALAMA
         tristate "Qualcomm Technologies Inc KALAMA pin controller driver"
         depends on GPIOLIB && OF

drivers/pinctrl/qcom/Makefile

@@ -2,6 +2,7 @@
 # Qualcomm pin control drivers
 obj-$(CONFIG_PINCTRL_MSM)	+= pinctrl-msm.o
 obj-$(CONFIG_PINCTRL_PINEAPPLE)	+= pinctrl-pineapple.o
+obj-$(CONFIG_PINCTRL_CLIFFS)    += pinctrl-cliffs.o
 obj-$(CONFIG_PINCTRL_KALAMA)	+= pinctrl-kalama.o
 obj-$(CONFIG_PINCTRL_APQ8064)	+= pinctrl-apq8064.o
 obj-$(CONFIG_PINCTRL_APQ8084)	+= pinctrl-apq8084.o