gpio: mcp23s08: make driver depend on OF_GPIO

[cascardo/linux.git] / drivers / gpio / Kconfig

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index d786061..24caedb 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -50,6 +50,7 @@ config GPIO_DEVRES
 config OF_GPIO
        def_bool y
        depends on OF
+       depends on HAS_IOMEM
 
 config GPIO_ACPI
        def_bool y
@@ -188,7 +189,7 @@ config GPIO_EP93XX
 config GPIO_ETRAXFS
        bool "Axis ETRAX FS General I/O"
        depends on CRIS || COMPILE_TEST
-       depends on OF
+       depends on OF_GPIO
        select GPIO_GENERIC
        select GPIOLIB_IRQCHIP
        help
@@ -214,7 +215,7 @@ config GPIO_GENERIC_PLATFORM
 
 config GPIO_GRGPIO
        tristate "Aeroflex Gaisler GRGPIO support"
-       depends on OF
+       depends on OF_GPIO
        select GPIO_GENERIC
        select IRQ_DOMAIN
        help
@@ -250,7 +251,7 @@ config GPIO_LOONGSON
          driver for GPIO functionality on Loongson-2F/3A/3B processors.
 
 config GPIO_LPC18XX
-       bool "NXP LPC18XX/43XX GPIO support"
+       tristate "NXP LPC18XX/43XX GPIO support"
        default y if ARCH_LPC18XX
        depends on OF_GPIO && (ARCH_LPC18XX || COMPILE_TEST)
        help
@@ -312,7 +313,7 @@ config GPIO_MPC8XXX
 config GPIO_MVEBU
        def_bool y
        depends on PLAT_ORION
-       depends on OF
+       depends on OF_GPIO
        select GENERIC_IRQ_CHIP
 
 config GPIO_MXC
@@ -405,7 +406,7 @@ config GPIO_TEGRA
        bool "NVIDIA Tegra GPIO support"
        default ARCH_TEGRA
        depends on ARCH_TEGRA || COMPILE_TEST
-       depends on OF
+       depends on OF_GPIO
        help
          Say yes here to support GPIO pins on NVIDIA Tegra SoCs.
 
@@ -874,6 +875,15 @@ config GPIO_LP3943
          LP3943 can be used as a GPIO expander which provides up to 16 GPIOs.
          Open drain outputs are required for this usage.
 
+config GPIO_MAX77620
+       tristate "GPIO support for PMIC MAX77620 and MAX20024"
+       depends on MFD_MAX77620
+       help
+         GPIO driver for MAX77620 and MAX20024 PMIC from Maxim Semiconductor.
+         MAX77620 PMIC has 8 pins that can be configured as GPIOs. The
+         driver also provides interrupt support for each of the gpios.
+         Say yes here to enable the max77620 to be used as gpio controller.
+
 config GPIO_MSIC
        bool "Intel MSIC mixed signal gpio support"
        depends on MFD_INTEL_MSIC
@@ -1029,11 +1039,18 @@ config GPIO_BT8XX
          If unsure, say N.
 
 config GPIO_INTEL_MID
-       bool "Intel Mid GPIO support"
-       depends on X86
+       bool "Intel MID GPIO support"
+       depends on X86_INTEL_MID
+       select GPIOLIB_IRQCHIP
+       help
+         Say Y here to support Intel MID GPIO.
+
+config GPIO_MERRIFIELD
+       tristate "Intel Merrifield GPIO support"
+       depends on X86_INTEL_MID
        select GPIOLIB_IRQCHIP
        help
-         Say Y here to support Intel Mid GPIO.
+         Say Y here to support Intel Merrifield GPIO.
 
 config GPIO_ML_IOH
        tristate "OKI SEMICONDUCTOR ML7213 IOH GPIO support"
@@ -1083,7 +1100,7 @@ menu "SPI GPIO expanders"
 
 config GPIO_74X164
        tristate "74x164 serial-in/parallel-out 8-bits shift register"
-       depends on OF
+       depends on OF_GPIO
        help
          Driver for 74x164 compatible serial-in/parallel-out 8-outputs
          shift registers. This driver can be used to provide access
@@ -1114,6 +1131,7 @@ menu "SPI or I2C GPIO expanders"
 
 config GPIO_MCP23S08
        tristate "Microchip MCP23xxx I/O expander"
+       depends on OF_GPIO
        select GPIOLIB_IRQCHIP
        help
          SPI/I2C driver for Microchip MCP23S08/MCP23S17/MCP23008/MCP23017