From: Linus Walleij <linus.walleij@linaro.org>
Date: Tue, 23 May 2017 07:52:40 +0000 (+0200)
Subject: Merge branch 'mcp23s08' of /home/linus/linux-pinctrl into devel
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=350fe5ee49f4b94c5ef4164b41cd7a21ec8d8151;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'mcp23s08' of /home/linus/linux-pinctrl into devel
---

350fe5ee49f4b94c5ef4164b41cd7a21ec8d8151
diff --cc drivers/gpio/Kconfig
index dbde3ae03e74,5f88d7324e02..75e64607b209
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -1225,30 -1225,8 +1225,13 @@@ config GPIO_PISOS
  	  GPIO driver for SPI compatible parallel-in/serial-out shift
  	  registers. These are input only devices.
  
 +config GPIO_XRA1403
 +	tristate "EXAR XRA1403 16-bit GPIO expander"
 +	help
 +	  GPIO driver for EXAR XRA1403 16-bit SPI-based GPIO expander.
 +
  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