diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-24 17:01:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-24 17:01:46 -0400 |
commit | b1bf7d4d1b3911352cf1ec63c1de06214288ccd0 (patch) | |
tree | 0fd27c638977cb5c7e6e3f95085ce842b57a4ae3 /drivers/gpio/Kconfig | |
parent | 0708500d49e8439d9fe5529795bdc1485f0f46c3 (diff) | |
parent | 3e11f7b840b4671213c66817294ad7dd0b572756 (diff) |
Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6
Pull GPIO driver changes from Grant Likely:
"Lots of gpio changes, both to core code and drivers.
Changes do touch architecture code to remove the need for separate
arm/gpio.h includes in most architectures.
Some new drivers are added, and a number of gpio drivers are converted
to use irq_domains for gpio inputs used as interrupts. Device tree
support has been amended to allow multiple gpio_chips to use the same
device tree node.
Remaining changes are primarily bug fixes."
* tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6: (33 commits)
gpio/generic: initialize basic_mmio_gpio shadow variables properly
gpiolib: Remove 'const' from data argument of gpiochip_find()
gpio/rc5t583: add gpio driver for RICOH PMIC RC5T583
gpiolib: quiet gpiochip_add boot message noise
gpio: mpc8xxx: Prevent NULL pointer deref in demux handler
gpio/lpc32xx: Add device tree support
gpio: Adjust of_xlate API to support multiple GPIO chips
gpiolib: Implement devm_gpio_request_one()
gpio-mcp23s08: dbg_show: fix pullup configuration display
Add support for TCA6424A
gpio/omap: (re)fix wakeups on level-triggered GPIOs
gpio/omap: fix broken context restore for non-OFF mode transitions
gpio/omap: fix missing check in *_runtime_suspend()
gpio/omap: remove cpu_is_omapxxxx() checks from *_runtime_resume()
gpio/omap: remove suspend/resume callbacks
gpio/omap: remove retrigger variable in gpio_irq_handler
gpio/omap: remove saved_wakeup field from struct gpio_bank
gpio/omap: remove suspend_wakeup field from struct gpio_bank
gpio/omap: remove saved_fallingdetect, saved_risingdetect
gpio/omap: remove virtual_irq_start variable
...
Conflicts:
drivers/gpio/gpio-samsung.c
Diffstat (limited to 'drivers/gpio/Kconfig')
-rw-r--r-- | drivers/gpio/Kconfig | 39 |
1 files changed, 35 insertions, 4 deletions
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index eb80ba30045..aa3642cb820 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig | |||
@@ -2,6 +2,14 @@ | |||
2 | # GPIO infrastructure and drivers | 2 | # GPIO infrastructure and drivers |
3 | # | 3 | # |
4 | 4 | ||
5 | config ARCH_HAVE_CUSTOM_GPIO_H | ||
6 | bool | ||
7 | help | ||
8 | Selecting this config option from the architecture Kconfig allows | ||
9 | the architecture to provide a custom asm/gpio.h implementation | ||
10 | overriding the default implementations. New uses of this are | ||
11 | strongly discouraged. | ||
12 | |||
5 | config ARCH_WANT_OPTIONAL_GPIOLIB | 13 | config ARCH_WANT_OPTIONAL_GPIOLIB |
6 | bool | 14 | bool |
7 | help | 15 | help |
@@ -37,6 +45,10 @@ menuconfig GPIOLIB | |||
37 | 45 | ||
38 | if GPIOLIB | 46 | if GPIOLIB |
39 | 47 | ||
48 | config OF_GPIO | ||
49 | def_bool y | ||
50 | depends on OF && !SPARC | ||
51 | |||
40 | config DEBUG_GPIO | 52 | config DEBUG_GPIO |
41 | bool "Debug GPIO calls" | 53 | bool "Debug GPIO calls" |
42 | depends on DEBUG_KERNEL | 54 | depends on DEBUG_KERNEL |
@@ -249,7 +261,7 @@ config GPIO_MC9S08DZ60 | |||
249 | Select this to enable the MC9S08DZ60 GPIO driver | 261 | Select this to enable the MC9S08DZ60 GPIO driver |
250 | 262 | ||
251 | config GPIO_PCA953X | 263 | config GPIO_PCA953X |
252 | tristate "PCA953x, PCA955x, TCA64xx, and MAX7310 I/O ports" | 264 | tristate "PCA953x, PCA955x, PCA957x, TCA64xx, and MAX7310 I/O ports" |
253 | depends on I2C | 265 | depends on I2C |
254 | help | 266 | help |
255 | Say yes here to provide access to several register-oriented | 267 | Say yes here to provide access to several register-oriented |
@@ -258,10 +270,11 @@ config GPIO_PCA953X | |||
258 | 270 | ||
259 | 4 bits: pca9536, pca9537 | 271 | 4 bits: pca9536, pca9537 |
260 | 272 | ||
261 | 8 bits: max7310, pca9534, pca9538, pca9554, pca9557, | 273 | 8 bits: max7310, max7315, pca6107, pca9534, pca9538, pca9554, |
262 | tca6408 | 274 | pca9556, pca9557, pca9574, tca6408 |
263 | 275 | ||
264 | 16 bits: pca9535, pca9539, pca9555, tca6416 | 276 | 16 bits: max7312, max7313, pca9535, pca9539, pca9555, pca9575, |
277 | tca6416 | ||
265 | 278 | ||
266 | config GPIO_PCA953X_IRQ | 279 | config GPIO_PCA953X_IRQ |
267 | bool "Interrupt controller support for PCA953x" | 280 | bool "Interrupt controller support for PCA953x" |
@@ -294,6 +307,15 @@ config GPIO_PCF857X | |||
294 | This driver provides an in-kernel interface to those GPIOs using | 307 | This driver provides an in-kernel interface to those GPIOs using |
295 | platform-neutral GPIO calls. | 308 | platform-neutral GPIO calls. |
296 | 309 | ||
310 | config GPIO_RC5T583 | ||
311 | bool "RICOH RC5T583 GPIO" | ||
312 | depends on MFD_RC5T583 | ||
313 | help | ||
314 | Select this option to enable GPIO driver for the Ricoh RC5T583 | ||
315 | chip family. | ||
316 | This driver provides the support for driving/reading the gpio pins | ||
317 | of RC5T583 device through standard gpio library. | ||
318 | |||
297 | config GPIO_SX150X | 319 | config GPIO_SX150X |
298 | bool "Semtech SX150x I2C GPIO expander" | 320 | bool "Semtech SX150x I2C GPIO expander" |
299 | depends on I2C=y | 321 | depends on I2C=y |
@@ -405,6 +427,7 @@ config GPIO_BT8XX | |||
405 | config GPIO_LANGWELL | 427 | config GPIO_LANGWELL |
406 | bool "Intel Langwell/Penwell GPIO support" | 428 | bool "Intel Langwell/Penwell GPIO support" |
407 | depends on PCI && X86 | 429 | depends on PCI && X86 |
430 | select IRQ_DOMAIN | ||
408 | help | 431 | help |
409 | Say Y here to support Intel Langwell/Penwell GPIO. | 432 | Say Y here to support Intel Langwell/Penwell GPIO. |
410 | 433 | ||
@@ -520,4 +543,12 @@ config GPIO_TPS65910 | |||
520 | help | 543 | help |
521 | Select this option to enable GPIO driver for the TPS65910 | 544 | Select this option to enable GPIO driver for the TPS65910 |
522 | chip family. | 545 | chip family. |
546 | |||
547 | config GPIO_MSIC | ||
548 | bool "Intel MSIC mixed signal gpio support" | ||
549 | depends on MFD_INTEL_MSIC | ||
550 | help | ||
551 | Enable support for GPIO on intel MSIC controllers found in | ||
552 | intel MID devices | ||
553 | |||
523 | endif | 554 | endif |