Merge tag 'armsoc-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / gpio / Kconfig

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 5e4e9f5c8a64115befba02bd79ae480939532d40..c88dd24a4b1f15c074b00e10fd8f15d5d6540f3a 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -134,8 +134,8 @@ config GPIO_BCM_KONA
 
 config GPIO_BRCMSTB
        tristate "BRCMSTB GPIO support"
-       default y if ARCH_BRCMSTB
-       depends on OF_GPIO && (ARCH_BRCMSTB || COMPILE_TEST)
+       default y if (ARCH_BRCMSTB || BMIPS_GENERIC)
+       depends on OF_GPIO && (ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST)
        select GPIO_GENERIC
        select GPIOLIB_IRQCHIP
        help
@@ -489,8 +489,21 @@ menu "Port-mapped I/O GPIO drivers"
 
 config GPIO_104_IDIO_16
        tristate "ACCES 104-IDIO-16 GPIO support"
+       select GPIOLIB_IRQCHIP
+       help
+         Enables GPIO support for the ACCES 104-IDIO-16 family. The base port
+         address for the device may be set via the idio_16_base module
+         parameter. The interrupt line number for the device may be set via the
+         idio_16_irq module parameter.
+
+config GPIO_104_IDI_48
+       tristate "ACCES 104-IDI-48 GPIO support"
+       select GPIOLIB_IRQCHIP
        help
-         Enables GPIO support for the ACCES 104-IDIO-16 family.
+         Enables GPIO support for the ACCES 104-IDI-48 family. The base port
+         address for the device may be configured via the idi_48_base module
+         parameter. The interrupt line number for the device may be configured
+         via the idi_48_irq module parameter.
 
 config GPIO_F7188X
        tristate "F71869, F71869A, F71882FG and F71889F GPIO support"
@@ -900,7 +913,6 @@ menu "PCI GPIO expanders"
 
 config GPIO_AMD8111
        tristate "AMD 8111 GPIO driver"
-       depends on PCI
        help
          The AMD 8111 south bridge contains 32 GPIO pins which can be used.
 
@@ -912,7 +924,7 @@ config GPIO_AMD8111
 
 config GPIO_BT8XX
        tristate "BT8XX GPIO abuser"
-       depends on PCI && VIDEO_BT848=n
+       depends on VIDEO_BT848=n
        help
          The BT8xx frame grabber chip has 24 GPIO pins that can be abused
          as a cheap PCI GPIO card.
@@ -928,14 +940,13 @@ config GPIO_BT8XX
 
 config GPIO_INTEL_MID
        bool "Intel Mid GPIO support"
-       depends on PCI && X86
+       depends on X86
        select GPIOLIB_IRQCHIP
        help
          Say Y here to support Intel Mid GPIO.
 
 config GPIO_ML_IOH
        tristate "OKI SEMICONDUCTOR ML7213 IOH GPIO support"
-       depends on PCI
        select GENERIC_IRQ_CHIP
        help
          ML7213 is companion chip for Intel Atom E6xx series.
@@ -945,7 +956,7 @@ config GPIO_ML_IOH
 
 config GPIO_PCH
        tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7223/ML7831) GPIO"
-       depends on PCI && (X86_32 || COMPILE_TEST)
+       depends on X86_32 || MIPS || COMPILE_TEST
        select GENERIC_IRQ_CHIP
        help
          This driver is for PCH(Platform controller Hub) GPIO of Intel Topcliff
@@ -961,7 +972,6 @@ config GPIO_PCH
 
 config GPIO_RDC321X
        tristate "RDC R-321x GPIO support"
-       depends on PCI
        select MFD_CORE
        select MFD_RDC321X
        help
@@ -970,7 +980,7 @@ config GPIO_RDC321X
 
 config GPIO_SODAVILLE
        bool "Intel Sodaville GPIO support"
-       depends on X86 && PCI && OF
+       depends on X86 && OF
        select GPIO_GENERIC
        select GENERIC_IRQ_CHIP
        help
@@ -1021,7 +1031,7 @@ menu "USB GPIO expanders"
 
 config GPIO_VIPERBOARD
        tristate "Viperboard GPIO a & b support"
-       depends on MFD_VIPERBOARD && USB
+       depends on MFD_VIPERBOARD
        help
          Say yes here to access the GPIO signals of Nano River
          Technologies Viperboard. There are two GPIO chips on the