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

[linux-2.6-omap-h63xx.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 0dae245c625953fa2194f643d580db06f00a3aac..5a79d2d4cdaeaff90e0306a651dea21ba95e79f8 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -52,6 +52,8 @@ config HTC_PASIC3
 
 config UCB1400_CORE
        tristate "Philips UCB1400 Core driver"
 
 config UCB1400_CORE
        tristate "Philips UCB1400 Core driver"

+       depends on AC97_BUS
+       depends on GPIOLIB

        help
          This enables support for the Philips UCB1400 core functions.
          The UCB1400 is an AC97 audio codec.
        help
          This enables support for the Philips UCB1400 core functions.
          The UCB1400 is an AC97 audio codec.


@@ -59,6 +61,20 @@ config UCB1400_CORE
          To compile this driver as a module, choose M here: the
          module will be called ucb1400_core.
 
          To compile this driver as a module, choose M here: the
          module will be called ucb1400_core.
 

+config TWL4030_CORE
+       bool "Texas Instruments TWL4030/TPS659x0 Support"
+       depends on I2C=y && GENERIC_HARDIRQS && (ARCH_OMAP2 || ARCH_OMAP3)
+       help
+         Say yes here if you have TWL4030 family chip on your board.
+         This core driver provides register access and IRQ handling
+         facilities, and registers devices for the various functions
+         so that function-specific drivers can bind to them.
+
+         These multi-function chips are found on many OMAP2 and OMAP3
+         boards, providing power management, RTC, GPIO, keypad, a
+         high speed USB OTG transceiver, an audio codec (on most
+         versions) and many other features.
+

 config MFD_TMIO
        bool
        default n
 config MFD_TMIO
        bool
        default n


@@ -87,6 +103,44 @@ config MFD_TC6393XB
        help
          Support for Toshiba Mobile IO Controller TC6393XB
 
        help
          Support for Toshiba Mobile IO Controller TC6393XB
 

+config MFD_WM8400
+       tristate "Support Wolfson Microelectronics WM8400"
+       help
+         Support for the Wolfson Microelecronics WM8400 PMIC and audio
+         CODEC.  This driver adds provides common support for accessing
+         the device, additional drivers must be enabled in order to use
+         the functionality of the device.
+
+config MFD_WM8350
+       tristate
+
+config MFD_WM8350_CONFIG_MODE_0
+       bool
+       depends on MFD_WM8350
+
+config MFD_WM8350_CONFIG_MODE_1
+       bool
+       depends on MFD_WM8350
+
+config MFD_WM8350_CONFIG_MODE_2
+       bool
+       depends on MFD_WM8350
+
+config MFD_WM8350_CONFIG_MODE_3
+       bool
+       depends on MFD_WM8350
+
+config MFD_WM8350_I2C
+       tristate "Support Wolfson Microelectronics WM8350 with I2C"
+       select MFD_WM8350
+       depends on I2C
+       help
+         The WM8350 is an integrated audio and power management
+         subsystem with watchdog and RTC functionality for embedded
+         systems.  This option enables core support for the WM8350 with
+         I2C as the control interface.  Additional options must be
+         selected to enable support for the functionality of the chip.
+

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