diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2016-10-24 16:33:34 +0200 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2016-10-24 16:33:34 +0200 |
commit | 54e2602f04ee1bcf02395ff2cbaaa81308b56710 (patch) | |
tree | 7c76ce283c618eedd521c9d3ad69951064aaad91 /drivers/gpio/Kconfig | |
parent | f08ea3cc94eeaf938ad9da86014e8fee79299458 (diff) | |
parent | 9e80f9064e73f9f82679884ddf8b03ac3606cf4a (diff) | |
download | linux-stable-54e2602f04ee1bcf02395ff2cbaaa81308b56710.tar.gz linux-stable-54e2602f04ee1bcf02395ff2cbaaa81308b56710.tar.bz2 linux-stable-54e2602f04ee1bcf02395ff2cbaaa81308b56710.zip |
Merge branch 'ib-sx150x' of /home/linus/linux-pinctrl into devel
Diffstat (limited to 'drivers/gpio/Kconfig')
-rw-r--r-- | drivers/gpio/Kconfig | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 8eea33269433..cdff5748f5be 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -781,16 +781,13 @@ config GPIO_PCF857X platform-neutral GPIO calls. config GPIO_SX150X - bool "Semtech SX150x I2C GPIO expander" - depends on I2C=y - select GPIOLIB_IRQCHIP + bool "Semtech SX150x I2C GPIO expander (deprecated)" + depends on PINCTRL && I2C=y + select PINCTRL_SX150X default n help - Say yes here to provide support for Semtech SX150-series I2C - GPIO expanders. Compatible models include: - - 8 bits: sx1508q - 16 bits: sx1509q + Say yes here to provide support for Semtech SX150x-series I2C + GPIO expanders. The GPIO driver was replaced by a Pinctrl version. config GPIO_TPIC2810 tristate "TPIC2810 8-Bit I2C GPO expander" |