Merge branch 'master' into for-next

[karo-tx-linux.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 87829789243e87ded4653aa8b41da634060a670d..2a5a0b78f84eacf4a203d2cc088cc9894772cc1d 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -9,6 +9,16 @@ config MFD_CORE
        tristate
        default n
 
        tristate
        default n
 

+config MFD_88PM860X
+       bool "Support Marvell 88PM8606/88PM8607"
+       depends on I2C=y && GENERIC_HARDIRQS
+       select MFD_CORE
+       help
+         This supports for Marvell 88PM8606/88PM8607 Power Management IC.
+         This includes the I2C driver and the core APIs _only_, you have to
+         select individual components like voltage regulators, RTC and
+         battery-charger under the corresponding menus.
+

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


@@ -37,7 +47,7 @@ config MFD_ASIC3
 
 config MFD_SH_MOBILE_SDHI
        bool "Support for SuperH Mobile SDHI"
 
 config MFD_SH_MOBILE_SDHI
        bool "Support for SuperH Mobile SDHI"

-       depends on SUPERH
+       depends on SUPERH || ARCH_SHMOBILE

        select MFD_CORE
         ---help---
          This driver supports the SDHI hardware block found in many
        select MFD_CORE
         ---help---
          This driver supports the SDHI hardware block found in many


@@ -68,6 +78,15 @@ 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 HTC_I2CPLD
+       bool "HTC I2C PLD chip support"
+       depends on I2C=y && GPIOLIB
+       help
+         If you say yes here you get support for the supposed CPLD
+         found on omap850 HTC devices like the HTC Wizard and HTC Herald.
+         This device provides input and output GPIOs through an I2C
+         interface to one or more sub-chips.
+

 config UCB1400_CORE
        tristate "Philips UCB1400 Core driver"
        depends on AC97_BUS
 config UCB1400_CORE
        tristate "Philips UCB1400 Core driver"
        depends on AC97_BUS


@@ -94,7 +113,7 @@ config TPS65010
 
 config MENELAUS
        bool "Texas Instruments TWL92330/Menelaus PM chip"
 
 config MENELAUS
        bool "Texas Instruments TWL92330/Menelaus PM chip"

-       depends on I2C=y && ARCH_OMAP24XX
+       depends on I2C=y && ARCH_OMAP2

        help
          If you say yes here you get support for the Texas Instruments
          TWL92330/Menelaus Power Management chip. This include voltage
        help
          If you say yes here you get support for the Texas Instruments
          TWL92330/Menelaus Power Management chip. This include voltage


@@ -184,6 +203,16 @@ config PMIC_ADP5520
          individual components like LCD backlight, LEDs, GPIOs and Kepad
          under the corresponding menus.
 
          individual components like LCD backlight, LEDs, GPIOs and Kepad
          under the corresponding menus.
 

+config MFD_MAX8925
+       bool "Maxim Semiconductor MAX8925 PMIC Support"
+       depends on I2C=y && GENERIC_HARDIRQS
+       select MFD_CORE
+       help
+         Say yes here to support for Maxim Semiconductor MAX8925. This is
+         a Power Management IC. This driver provies common support for
+         accessing the device, additional drivers must be enabled in order
+         to use the functionality of the device.
+

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


@@ -197,7 +226,7 @@ config MFD_WM8400
 config MFD_WM831X
        bool "Support Wolfson Microelectronics WM831x/2x PMICs"
        select MFD_CORE
 config MFD_WM831X
        bool "Support Wolfson Microelectronics WM831x/2x PMICs"
        select MFD_CORE

-       depends on I2C=y
+       depends on I2C=y && GENERIC_HARDIRQS

        help
          Support for the Wolfson Microelecronics WM831x and WM832x PMICs.
          This driver provides common support for accessing the device,
        help
          Support for the Wolfson Microelecronics WM831x and WM832x PMICs.
          This driver provides common support for accessing the device,


@@ -205,7 +234,8 @@ config MFD_WM831X
          functionality of the device.
 
 config MFD_WM8350
          functionality of the device.
 
 config MFD_WM8350

-       tristate
+       bool
+       depends on GENERIC_HARDIRQS

 
 config MFD_WM8350_CONFIG_MODE_0
        bool
 
 config MFD_WM8350_CONFIG_MODE_0
        bool


@@ -256,9 +286,9 @@ config MFD_WM8352_CONFIG_MODE_3
        depends on MFD_WM8350
 
 config MFD_WM8350_I2C
        depends on MFD_WM8350
 
 config MFD_WM8350_I2C

-       tristate "Support Wolfson Microelectronics WM8350 with I2C"
+       bool "Support Wolfson Microelectronics WM8350 with I2C"

        select MFD_WM8350
        select MFD_WM8350

-       depends on I2C
+       depends on I2C=y && GENERIC_HARDIRQS

        help
          The WM8350 is an integrated audio and power management
          subsystem with watchdog and RTC functionality for embedded
        help
          The WM8350 is an integrated audio and power management
          subsystem with watchdog and RTC functionality for embedded


@@ -266,6 +296,18 @@ config MFD_WM8350_I2C
          I2C as the control interface.  Additional options must be
          selected to enable support for the functionality of the chip.
 
          I2C as the control interface.  Additional options must be
          selected to enable support for the functionality of the chip.
 

+config MFD_WM8994
+       tristate "Support Wolfson Microelectronics WM8994"
+       select MFD_CORE
+       depends on I2C
+       help
+         The WM8994 is a highly integrated hi-fi CODEC designed for
+         smartphone applicatiosn.  As well as audio functionality it
+         has on board GPIO and regulator functionality which is
+         supported via the relevant subsystems.  This driver provides
+         core support for the WM8994, in order to use the actual
+         functionaltiy of the device other drivers must be enabled.
+

 config MFD_PCF50633
        tristate "Support for NXP PCF50633"
        depends on I2C
 config MFD_PCF50633
        tristate "Support for NXP PCF50633"
        depends on I2C


@@ -300,8 +342,8 @@ config PCF50633_GPIO
         the PCF50633 chip.
 
 config AB3100_CORE
         the PCF50633 chip.
 
 config AB3100_CORE

-       tristate "ST-Ericsson AB3100 Mixed Signal Circuit core functions"
-       depends on I2C
+       bool "ST-Ericsson AB3100 Mixed Signal Circuit core functions"
+       depends on I2C=y

        default y if ARCH_U300
        help
          Select this to enable the AB3100 Mixed Signal IC core
        default y if ARCH_U300
        help
          Select this to enable the AB3100 Mixed Signal IC core


@@ -329,16 +371,6 @@ config EZX_PCAP
          This enables the PCAP ASIC present on EZX Phones. This is
          needed for MMC, TouchScreen, Sound, USB, etc..
 
          This enables the PCAP ASIC present on EZX Phones. This is
          needed for MMC, TouchScreen, Sound, USB, etc..
 

-config MFD_88PM8607
-       bool "Support Marvell 88PM8607"
-       depends on I2C=y
-       select MFD_CORE
-       help
-         This supports for Marvell 88PM8607 Power Management IC. This includes
-         the I2C driver and the core APIs _only_, you have to select
-         individual components like voltage regulators, RTC and
-         battery-charger under the corresponding menus.
-

 config AB4500_CORE
        tristate "ST-Ericsson's AB4500 Mixed Signal Power management chip"
        depends on SPI
 config AB4500_CORE
        tristate "ST-Ericsson's AB4500 Mixed Signal Power management chip"
        depends on SPI


@@ -348,6 +380,25 @@ config AB4500_CORE
          read/write functions for the devices to get access to this chip.
          This chip embeds various other multimedia funtionalities as well.
 
          read/write functions for the devices to get access to this chip.
          This chip embeds various other multimedia funtionalities as well.
 

+config MFD_TIMBERDALE
+       tristate "Support for the Timberdale FPGA"
+       select MFD_CORE
+       depends on PCI && GPIOLIB
+       ---help---
+       This is the core driver for the timberdale FPGA. This device is a
+       multifunction device which exposes numerous platform devices.
+
+       The timberdale FPGA can be found on the Intel Atom development board
+       for in-vehicle infontainment, called Russellville.
+
+config LPC_SCH
+       tristate "Intel SCH LPC"
+       depends on PCI
+       select MFD_CORE
+       help
+         LPC bridge function of the Intel SCH provides support for
+         System Management Bus and General Purpose I/O.
+

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