Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux

[linux-2.6] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 9f93c29fed355074cb443184da54343102c42625..10c44d3fe01a429172855d2b76ea54e9255b6779 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -19,6 +19,14 @@ config MFD_SM501
          interface. The device may be connected by PCI or local bus with
          varying functions enabled.
 
          interface. The device may be connected by PCI or local bus with
          varying functions enabled.
 

+config MFD_SM501_GPIO
+       bool "Export GPIO via GPIO layer"
+       depends on MFD_SM501 && HAVE_GPIO_LIB
+        ---help---
+        This option uses the gpio library layer to export the 64 GPIO
+        lines on the SM501. The platform data is used to supply the
+        base number for the first GPIO line to register.
+

 config MFD_ASIC3
        bool "Support for Compaq ASIC3"
        depends on GENERIC_HARDIRQS && HAVE_GPIO_LIB && ARM
 config MFD_ASIC3
        bool "Support for Compaq ASIC3"
        depends on GENERIC_HARDIRQS && HAVE_GPIO_LIB && ARM


@@ -28,7 +36,7 @@ config MFD_ASIC3
 
 config HTC_EGPIO
        bool "HTC EGPIO support"
 
 config HTC_EGPIO
        bool "HTC EGPIO support"

-       depends on GENERIC_HARDIRQS && HAVE_GPIO_LIB && ARM
+       depends on GENERIC_HARDIRQS && GPIOLIB && ARM

        help
            This driver supports the CPLD egpio chip present on
            several HTC phones.  It provides basic support for input
        help
            This driver supports the CPLD egpio chip present on
            several HTC phones.  It provides basic support for input


@@ -42,10 +50,31 @@ config HTC_PASIC3
          HTC Magician devices, respectively. Actual functionality is
          handled by the leds-pasic3 and ds1wm drivers.
 
          HTC Magician devices, respectively. Actual functionality is
          handled by the leds-pasic3 and ds1wm drivers.
 

+config MFD_TMIO
+       bool
+       default n
+
+config MFD_T7L66XB
+       bool "Support Toshiba T7L66XB"
+       depends on ARM
+       select MFD_CORE
+       select MFD_TMIO
+       help
+         Support for Toshiba Mobile IO Controller T7L66XB
+
+config MFD_TC6387XB
+       bool "Support Toshiba TC6387XB"
+       depends on ARM
+       select MFD_CORE
+       select MFD_TMIO
+       help
+         Support for Toshiba Mobile IO Controller TC6387XB
+

 config MFD_TC6393XB
        bool "Support Toshiba TC6393XB"
 config MFD_TC6393XB
        bool "Support Toshiba TC6393XB"

-       depends on HAVE_GPIO_LIB
+       depends on GPIOLIB && ARM

        select MFD_CORE
        select MFD_CORE

+       select MFD_TMIO

        help
          Support for Toshiba Mobile IO Controller TC6393XB
 
        help
          Support for Toshiba Mobile IO Controller TC6393XB