Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb

[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 2967002..1eb284d
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -350,18 +350,19 @@ config GPIO_LANGWELL
          Say Y here to support Intel Langwell/Penwell GPIO.
 
 config GPIO_PCH
-       tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7223 IOH GPIO"
+       tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7223/ML7831) GPIO"
        depends on PCI && X86
        help
          This driver is for PCH(Platform controller Hub) GPIO of Intel Topcliff
          which is an IOH(Input/Output Hub) for x86 embedded processor.
          This driver can access PCH GPIO device.
 
-         This driver also can be used for OKI SEMICONDUCTOR IOH(Input/
-         Output Hub), ML7223.
+         This driver also can be used for LAPIS Semiconductor IOH(Input/
+         Output Hub), ML7223 and ML7831.
          ML7223 IOH is for MP(Media Phone) use.
-         ML7223 is companion chip for Intel Atom E6xx series.
-         ML7223 is completely compatible for Intel EG20T PCH.
+         ML7831 IOH is for general purpose use.
+         ML7223/ML7831 is companion chip for Intel Atom E6xx series.
+         ML7223/ML7831 is completely compatible for Intel EG20T PCH.
 
 config GPIO_ML_IOH
        tristate "OKI SEMICONDUCTOR ML7213 IOH GPIO support"
@@ -431,6 +432,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