Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36

[firefly-linux-kernel-4.4.55.git] / drivers / gpio / Kconfig

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
old mode 100644 (file)
new mode 100755 (executable)
index 510aa20..ffe29c2
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -227,6 +227,13 @@ config GPIO_TWL4030
          Say yes here to access the GPIO signals of various multi-function
          power management chips from Texas Instruments.
 
+config GPIO_TPS65910
+       bool "TPS65910 GPIOs"
+       depends on TPS65910_CORE
+       help
+         Say yes here to access the GPIO signal of TPS65910x multi-function
+         power management chips from Texas Instruments.
+
 config GPIO_WM831X
        tristate "WM831x GPIOs"
        depends on MFD_WM831X
@@ -351,6 +358,45 @@ config GPIO_UCB1400
          To compile this driver as a module, choose M here: the
          module will be called ucb1400_gpio.
 
+config GPIO_PCA9554
+       bool "GPIO EXPANDER PCA9554"
+       depends on I2C
+       help
+         Say yes here to access the PCA9554 GPIO EXPANDER
+
+config IOEXTEND_TCA6424
+       bool "ROCKCHIP TCA6424 CONTROL"
+       depends on I2C
+       help
+         Say yes here to access the TCA6424 GPIO EXPANDER
+
+config EXPANDED_GPIO_NUM  
+       int "setting the amount of expanded gpios"
+       help
+         for tca6424, set 24
+       
+config EXPANDED_GPIO_IRQ_NUM
+       int "setting the amount of expanded gpio irqs"
+       help
+         for tca6424, set 24   
+
+config EXPAND_GPIO_SOFT_INTERRUPT
+       bool "soft interrupt for expand gpio use"
+       help
+         if you want expand gpio support interrupt,choose it
+
+config SPI_FPGA_GPIO_NUM  
+       default 96
+       int "setting the amount of fpga gpios"
+       help
+         for fpga, set 96,no used ,set 0
+       
+config SPI_FPGA_GPIO_IRQ_NUM
+       default 16
+       int "setting the amount of fpga gpio irqs"
+       help
+         for fpga, set 16,no used ,set 0       
+
 comment "MODULbus GPIO expanders:"
 
 config GPIO_JANZ_TTL