gpio: fix up SPI submenu

- Relax dependencies on SPI_MASTER for drivers in the SPI menu
  that already has this dependency.
- Move out the expander that would be hidden for I2C access if
  SPI_MASTER was not selected. Tentatively create a separate
  menu for this.
- Move the ZX SoC driver to memory-mapped drivers, this must be
  a mistake and only worked because the system has an SPI master
  enabled at the same time.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2015-11-01 10:50:19 +01:00
parent 269a46f80b
commit 0963670aea
1 changed files with 18 additions and 16 deletions

View File

@ -483,6 +483,12 @@ config GPIO_ZYNQ
help help
Say yes here to support Xilinx Zynq GPIO controller. Say yes here to support Xilinx Zynq GPIO controller.
config GPIO_ZX
bool "ZTE ZX GPIO support"
select GPIOLIB_IRQCHIP
help
Say yes here to support the GPIO device on ZTE ZX SoCs.
endmenu endmenu
menu "Port-mapped I/O GPIO drivers" menu "Port-mapped I/O GPIO drivers"
@ -984,7 +990,7 @@ menu "SPI GPIO expanders"
config GPIO_74X164 config GPIO_74X164
tristate "74x164 serial-in/parallel-out 8-bits shift register" tristate "74x164 serial-in/parallel-out 8-bits shift register"
depends on SPI_MASTER && OF depends on OF
help help
Driver for 74x164 compatible serial-in/parallel-out 8-outputs Driver for 74x164 compatible serial-in/parallel-out 8-outputs
shift registers. This driver can be used to provide access shift registers. This driver can be used to provide access
@ -992,33 +998,29 @@ config GPIO_74X164
config GPIO_MAX7301 config GPIO_MAX7301
tristate "Maxim MAX7301 GPIO expander" tristate "Maxim MAX7301 GPIO expander"
depends on SPI_MASTER
select GPIO_MAX730X select GPIO_MAX730X
help help
GPIO driver for Maxim MAX7301 SPI-based GPIO expander. GPIO driver for Maxim MAX7301 SPI-based GPIO expander.
config GPIO_MC33880
tristate "Freescale MC33880 high-side/low-side switch"
help
SPI driver for Freescale MC33880 high-side/low-side switch.
This provides GPIO interface supporting inputs and outputs.
endmenu
menu "SPI or I2C GPIO expanders"
depends on (SPI_MASTER && !I2C) || I2C
config GPIO_MCP23S08 config GPIO_MCP23S08
tristate "Microchip MCP23xxx I/O expander" tristate "Microchip MCP23xxx I/O expander"
depends on (SPI_MASTER && !I2C) || I2C
help help
SPI/I2C driver for Microchip MCP23S08/MCP23S17/MCP23008/MCP23017 SPI/I2C driver for Microchip MCP23S08/MCP23S17/MCP23008/MCP23017
I/O expanders. I/O expanders.
This provides a GPIO interface supporting inputs and outputs. This provides a GPIO interface supporting inputs and outputs.
The I2C versions of the chips can be used as interrupt-controller. The I2C versions of the chips can be used as interrupt-controller.
config GPIO_MC33880
tristate "Freescale MC33880 high-side/low-side switch"
depends on SPI_MASTER
help
SPI driver for Freescale MC33880 high-side/low-side switch.
This provides GPIO interface supporting inputs and outputs.
config GPIO_ZX
bool "ZTE ZX GPIO support"
select GPIOLIB_IRQCHIP
help
Say yes here to support the GPIO device on ZTE ZX SoCs.
endmenu endmenu
menu "USB GPIO expanders" menu "USB GPIO expanders"