Merge commit 'pinctrl/devel 4ddb1c2' into spear-for-3.8

This merges dependency branch pinctrl/devel for SPEAr DT updates.

diff --combined drivers/pinctrl/Kconfig
index aeecf0f72cad50c633953e4ffd9617709239095b,5f2f9dc43e3bca1a66910721276dc45059d69e60..4d4b08b51f83f7f061872f8d6138e07f90b25dc0
--- 1/drivers/pinctrl/Kconfig
--- 2/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@@ -143,8 -143,8 +143,8 @@@ config PINCTRL_SINGL
          This selects the device tree based generic pinctrl driver.
  
  config PINCTRL_SIRF
-       bool "CSR SiRFprimaII pin controller driver"
-       depends on ARCH_PRIMA2
+       bool "CSR SiRFprimaII/SiRFmarco pin controller driver"
+       depends on ARCH_SIRF
        select PINMUX
  
  config PINCTRL_TEGRA
@@@ -178,7 -178,7 +178,7 @@@ config PINCTRL_COH90
          ports of 8 GPIO pins each.
  
  config PINCTRL_SAMSUNG
 -      bool "Samsung pinctrl driver"
 +      bool
        depends on OF && GPIOLIB
        select PINMUX
        select PINCONF
@@@ -188,27 -188,7 +188,7 @@@ config PINCTRL_EXYNOS
        depends on OF && GPIOLIB
        select PINCTRL_SAMSUNG
  
- config PINCTRL_MVEBU
-       bool
-       depends on ARCH_MVEBU
-       select PINMUX
-       select PINCONF
- 
- config PINCTRL_DOVE
-       bool
-       select PINCTRL_MVEBU
- 
- config PINCTRL_KIRKWOOD
-       bool
-       select PINCTRL_MVEBU
- 
- config PINCTRL_ARMADA_370
-       bool
-       select PINCTRL_MVEBU
- 
- config PINCTRL_ARMADA_XP
-       bool
-       select PINCTRL_MVEBU
+ source "drivers/pinctrl/mvebu/Kconfig"
  
  source "drivers/pinctrl/spear/Kconfig"