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

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (31 commits)
  pinctrl: remove unnecessary max pin number
  pinctrl: correct a offset while enumerating pins
  pinctrl: some typo fixes
  pinctrl: rename U300 and SIRF pin controllers
  pinctrl: pass name instead of device to pin_config_*
  pinctrl: add "struct seq_file;" to pinconf.h
  pinctrl: conjure names for unnamed pins
  pinctrl: add a group-specific hog macro
  pinctrl: don't create a device for each pin controller
  arm/u300: don't use PINMUX_MAP_PRIMARY*
  pinctrl: implement PINMUX_MAP_SYS_HOG
  pinctrl: add a pin config interface
  pinctrl/coh901: driver to request its pins
  pinctrl: u300-pinmux: register proper GPIO ranges
  pinctrl: move the U300 GPIO driver to pinctrl
  ARM: u300: localize GPIO assignments
  pinctrl: make it possible to add multiple maps
  pinctrl: make a copy of pinmux map
  pinctrl: GPIO direction support for muxing
  pinctrl: print pin range in GPIO range debugs
  ...

1 files changed, 17 insertions, 5 deletions

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index e17e2f8001d..afaf8855812 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -12,7 +12,10 @@ menu "Pin controllers"
         depends on PINCTRL
 
 config PINMUX
-        bool "Support pinmux controllers"
+        bool "Support pin multiplexing controllers"
+
+config PINCONF
+        bool "Support pin configuration controllers"
 
 config DEBUG_PINCTRL
         bool "Debug PINCTRL calls"
@@ -20,16 +23,25 @@ config DEBUG_PINCTRL
         help
           Say Y here to add some extra checks and diagnostics to PINCTRL calls.
 
-config PINMUX_SIRF
-        bool "CSR SiRFprimaII pinmux driver"
+config PINCTRL_SIRF
+        bool "CSR SiRFprimaII pin controller driver"
         depends on ARCH_PRIMA2
         select PINMUX
 
-config PINMUX_U300
-        bool "U300 pinmux driver"
+config PINCTRL_U300
+        bool "U300 pin controller driver"
         depends on ARCH_U300
         select PINMUX
 
+config PINCTRL_COH901
+        bool "ST-Ericsson U300 COH 901 335/571 GPIO"
+        depends on GPIOLIB && ARCH_U300 && PINMUX_U300
+        help
+          Say yes here to support GPIO interface on ST-Ericsson U300.
+          The names of the two IP block variants supported are
+          COH 901 335 and COH 901 571/3. They contain 3, 5 or 7
+          ports of 8 GPIO pins each.
+
 endmenu
 
 endif