Merge branch 'mcp23s08' into devel

diff --combined drivers/gpio/Kconfig
index 45ed9acfd095f9962ec0d300507603f601e452e1,5f88d7324e02fbdf3028dcc4f1037788d8bd93e8..64bc995df191053e12ea81a63a98489794f2dd6c
--- 1/drivers/gpio/Kconfig
--- 2/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -242,16 -242,6 +242,16 @@@ config GPIO_IC
  
          If unsure, say N.
  
 +config GPIO_INGENIC
 +      tristate "Ingenic JZ47xx SoCs GPIO support"
 +      depends on MACH_INGENIC || COMPILE_TEST
 +      select GPIOLIB_IRQCHIP
 +      help
 +        Say yes here to support the GPIO functionality present on the
 +        JZ4740 and JZ4780 SoCs from Ingenic.
 +
 +        If unsure, say N.
 +
  config GPIO_IOP
        tristate "Intel IOP GPIO"
        depends on ARCH_IOP32X || ARCH_IOP33X || COMPILE_TEST
@@@ -1237,23 -1227,6 +1237,6 @@@ config GPIO_PISOS
  
  endmenu
  
- menu "SPI or I2C GPIO expanders"
-       depends on (SPI_MASTER && !I2C) || I2C
- 
- config GPIO_MCP23S08
-       tristate "Microchip MCP23xxx I/O expander"
-       depends on OF_GPIO
-       select GPIOLIB_IRQCHIP
-       select REGMAP_I2C if I2C
-       select REGMAP if SPI_MASTER
-       help
-         SPI/I2C driver for Microchip MCP23S08/MCP23S17/MCP23008/MCP23017
-         I/O expanders.
-         This provides a GPIO interface supporting inputs and outputs.
-         The I2C versions of the chips can be used as interrupt-controller.
- 
- endmenu
- 
  menu "USB GPIO expanders"
        depends on USB
  

diff --combined drivers/gpio/Makefile
index d2939677b4fa4c7ec33f560a2e93aabffc402ac0,89f10061a5c15a3a5e70988f33c82b8f565b0f37..845f990fc987a54ec701c0aed45bd8ae19d873f1
--- 1/drivers/gpio/Makefile
--- 2/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@@ -55,7 -55,6 +55,7 @@@ obj-$(CONFIG_GPIO_GPIO_MM)    += gpio-gpio
  obj-$(CONFIG_GPIO_GRGPIO)     += gpio-grgpio.o
  obj-$(CONFIG_HTC_EGPIO)               += gpio-htc-egpio.o
  obj-$(CONFIG_GPIO_ICH)                += gpio-ich.o
 +obj-$(CONFIG_GPIO_INGENIC)    += gpio-ingenic.o
  obj-$(CONFIG_GPIO_IOP)                += gpio-iop.o
  obj-$(CONFIG_GPIO_IT87)               += gpio-it87.o
  obj-$(CONFIG_GPIO_JANZ_TTL)   += gpio-janz-ttl.o
@@@ -78,7 -77,6 +78,6 @@@ obj-$(CONFIG_GPIO_MENZ127)    += gpio-menz
  obj-$(CONFIG_GPIO_MERRIFIELD) += gpio-merrifield.o
  obj-$(CONFIG_GPIO_MC33880)    += gpio-mc33880.o
  obj-$(CONFIG_GPIO_MC9S08DZ60) += gpio-mc9s08dz60.o
- obj-$(CONFIG_GPIO_MCP23S08)   += gpio-mcp23s08.o
  obj-$(CONFIG_GPIO_ML_IOH)     += gpio-ml-ioh.o
  obj-$(CONFIG_GPIO_MM_LANTIQ)  += gpio-mm-lantiq.o
  obj-$(CONFIG_GPIO_MOCKUP)      += gpio-mockup.o

diff --combined drivers/pinctrl/Kconfig
index 7cacf89f8838f366be5135445ffeb24617ef99c3,1c80b970554eb5a569b3c6edf31a0b60e5c5f67f..abc1cef7ad9694bc617ed38e2f0dc4dbdbe8ea56
--- 1/drivers/pinctrl/Kconfig
--- 2/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@@ -146,6 -146,19 +146,19 @@@ config PINCTRL_FALCO
        depends on SOC_FALCON
        depends on PINCTRL_LANTIQ
  
+ config PINCTRL_MCP23S08
+       tristate "Microchip MCP23xxx I/O expander"
+       depends on SPI_MASTER || I2C
+       select GPIOLIB_IRQCHIP
+       select REGMAP_I2C if I2C
+       select REGMAP_SPI if SPI_MASTER
+       select GENERIC_PINCONF
+       help
+         SPI/I2C driver for Microchip MCP23S08/MCP23S17/MCP23008/MCP23017
+         I/O expanders.
+         This provides a GPIO interface supporting inputs and outputs.
+         The I2C versions of the chips can be used as interrupt-controller.
+ 
  config PINCTRL_MESON
        bool
        depends on OF
@@@ -296,15 -309,6 +309,15 @@@ config PINCTRL_ZYN
        help
          This selects the pinctrl driver for Xilinx Zynq.
  
 +config PINCTRL_INGENIC
 +      bool "Pinctrl driver for the Ingenic JZ47xx SoCs"
 +      default y
 +      depends on MACH_INGENIC || COMPILE_TEST
 +      select GENERIC_PINCONF
 +      select GENERIC_PINCTRL_GROUPS
 +      select GENERIC_PINMUX_FUNCTIONS
 +      select REGMAP_MMIO
 +
  source "drivers/pinctrl/aspeed/Kconfig"
  source "drivers/pinctrl/bcm/Kconfig"
  source "drivers/pinctrl/berlin/Kconfig"
@@@ -324,7 -328,6 +337,7 @@@ source "drivers/pinctrl/ti/Kconfig
  source "drivers/pinctrl/uniphier/Kconfig"
  source "drivers/pinctrl/vt8500/Kconfig"
  source "drivers/pinctrl/mediatek/Kconfig"
 +source "drivers/pinctrl/zte/Kconfig"
  
  config PINCTRL_XWAY
        bool

diff --combined drivers/pinctrl/Makefile
index a054364c1e2f949ef7df4789444f077ec7d00ae9,59d793aa3db3ce8bbc6e4f686c1b6f37973f466e..f6ec4bd745a42d3d3831d0274409b37a19cab0c5
--- 1/drivers/pinctrl/Makefile
--- 2/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@@ -19,6 -19,7 +19,7 @@@ obj-$(CONFIG_PINCTRL_DA850_PUPD) += pin
  obj-$(CONFIG_PINCTRL_DIGICOLOR)       += pinctrl-digicolor.o
  obj-$(CONFIG_PINCTRL_FALCON)  += pinctrl-falcon.o
  obj-$(CONFIG_PINCTRL_MAX77620)        += pinctrl-max77620.o
+ obj-$(CONFIG_PINCTRL_MCP23S08)        += pinctrl-mcp23s08.o
  obj-$(CONFIG_PINCTRL_MESON)   += meson/
  obj-$(CONFIG_PINCTRL_OXNAS)   += pinctrl-oxnas.o
  obj-$(CONFIG_PINCTRL_PALMAS)  += pinctrl-palmas.o
@@@ -39,7 -40,6 +40,7 @@@ obj-$(CONFIG_PINCTRL_LPC18XX) += pinctr
  obj-$(CONFIG_PINCTRL_TB10X)   += pinctrl-tb10x.o
  obj-$(CONFIG_PINCTRL_ST)      += pinctrl-st.o
  obj-$(CONFIG_PINCTRL_ZYNQ)    += pinctrl-zynq.o
 +obj-$(CONFIG_PINCTRL_INGENIC) += pinctrl-ingenic.o
  
  obj-$(CONFIG_ARCH_ASPEED)     += aspeed/
  obj-y                         += bcm/
@@@ -59,4 -59,3 +60,4 @@@ obj-y                         += ti
  obj-$(CONFIG_PINCTRL_UNIPHIER)        += uniphier/
  obj-$(CONFIG_ARCH_VT8500)     += vt8500/
  obj-$(CONFIG_PINCTRL_MTK)     += mediatek/
 +obj-$(CONFIG_PINCTRL_ZX)      += zte/