Merge ../linux-2.6

[linux-2.6] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 260bade0a5ec5041ef104afb35a5a68a57cb68f0..883e7ea31de20af9d32df5cc6a09ff1d7c6041fd 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -5,6 +5,10 @@
 menu "Multifunction device drivers"
        depends on HAS_IOMEM
 
 menu "Multifunction device drivers"
        depends on HAS_IOMEM
 

+config MFD_CORE
+       tristate
+       default n
+

 config MFD_SM501
        tristate "Support for Silicon Motion SM501"
         ---help---
 config MFD_SM501
        tristate "Support for Silicon Motion SM501"
         ---help---


@@ -15,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


@@ -24,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


@@ -38,6 +50,13 @@ 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_TC6393XB
+       bool "Support Toshiba TC6393XB"
+       depends on GPIOLIB && ARM
+       select MFD_CORE
+       help
+         Support for Toshiba Mobile IO Controller TC6393XB
+

 endmenu
 
 menu "Multimedia Capabilities Port drivers"
 endmenu
 
 menu "Multimedia Capabilities Port drivers"