Merge branches 'topic/fix/hda' and 'topic/fix/misc' into for-linus

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

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 5a79d2d4cdaeaff90e0306a651dea21ba95e79f8..257277394f8c5527d164d6273c8f7b25a157544f 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -81,7 +81,7 @@ config MFD_TMIO
 
 config MFD_T7L66XB
        bool "Support Toshiba T7L66XB"
 
 config MFD_T7L66XB
        bool "Support Toshiba T7L66XB"

-       depends on ARM
+       depends on ARM && HAVE_CLK

        select MFD_CORE
        select MFD_TMIO
        help
        select MFD_CORE
        select MFD_TMIO
        help


@@ -89,7 +89,7 @@ config MFD_T7L66XB
 
 config MFD_TC6387XB
        bool "Support Toshiba TC6387XB"
 
 config MFD_TC6387XB
        bool "Support Toshiba TC6387XB"

-       depends on ARM
+       depends on ARM && HAVE_CLK

        select MFD_CORE
        select MFD_TMIO
        help
        select MFD_CORE
        select MFD_TMIO
        help


@@ -103,8 +103,20 @@ config MFD_TC6393XB
        help
          Support for Toshiba Mobile IO Controller TC6393XB
 
        help
          Support for Toshiba Mobile IO Controller TC6393XB
 

+config PMIC_DA903X
+       bool "Dialog Semiconductor DA9030/DA9034 PMIC Support"
+       depends on I2C=y
+       help
+         Say yes here to support for Dialog Semiconductor DA9030 (a.k.a
+         ARAVA) and DA9034 (a.k.a MICCO), these are Power Management IC
+         usually found on PXA processors-based platforms. This includes
+         the I2C driver and the core APIs _only_, you have to select
+         individual components like LCD backlight, voltage regulators,
+         LEDs and battery-charger under the corresponding menus.
+

 config MFD_WM8400
        tristate "Support Wolfson Microelectronics WM8400"
 config MFD_WM8400
        tristate "Support Wolfson Microelectronics WM8400"

+       depends on I2C

        help
          Support for the Wolfson Microelecronics WM8400 PMIC and audio
          CODEC.  This driver adds provides common support for accessing
        help
          Support for the Wolfson Microelecronics WM8400 PMIC and audio
          CODEC.  This driver adds provides common support for accessing