Merge tag '5.2-rc-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6

[linux-2.6-microblaze.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 26ad646..294d956 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -16,7 +16,7 @@ config MFD_CS5535
        depends on PCI && (X86_32 || (X86 && COMPILE_TEST))
        ---help---
          This is the core driver for CS5535/CS5536 MFD functions.  This is
        depends on PCI && (X86_32 || (X86 && COMPILE_TEST))
        ---help---
          This is the core driver for CS5535/CS5536 MFD functions.  This is

-          necessary for using the board's GPIO and MFGPT functionality.
+         necessary for using the board's GPIO and MFGPT functionality.

 
 config MFD_ALTERA_A10SR
        bool "Altera Arria10 DevKit System Resource chip"
 
 config MFD_ALTERA_A10SR
        bool "Altera Arria10 DevKit System Resource chip"


@@ -29,6 +29,16 @@ config MFD_ALTERA_A10SR
          accessing the external gpio extender (LEDs & buttons) and
          power supply alarms (hwmon).
 
          accessing the external gpio extender (LEDs & buttons) and
          power supply alarms (hwmon).
 

+config MFD_ALTERA_SYSMGR
+       bool "Altera SOCFPGA System Manager"
+       depends on (ARCH_SOCFPGA || ARCH_STRATIX10) && OF
+       select MFD_SYSCON
+       help
+         Select this to get System Manager support for all Altera branded
+         SOCFPGAs. The SOCFPGA System Manager handles all SOCFPGAs by
+         using regmap_mmio accesses for ARM32 parts and SMC calls to
+         EL3 for ARM64 parts.
+

 config MFD_ACT8945A
        tristate "Active-semi ACT8945A"
        select MFD_CORE
 config MFD_ACT8945A
        tristate "Active-semi ACT8945A"
        select MFD_CORE


@@ -213,13 +223,13 @@ config MFD_CROS_EC
          protocol for talking to the EC is defined by the bus driver.
 
 config MFD_CROS_EC_CHARDEV
          protocol for talking to the EC is defined by the bus driver.
 
 config MFD_CROS_EC_CHARDEV

-        tristate "Chrome OS Embedded Controller userspace device interface"
-        depends on MFD_CROS_EC
-        ---help---
-          This driver adds support to talk with the ChromeOS EC from userspace.
+       tristate "Chrome OS Embedded Controller userspace device interface"
+       depends on MFD_CROS_EC
+       ---help---
+         This driver adds support to talk with the ChromeOS EC from userspace.

 
 

-          If you have a supported Chromebook, choose Y or M here.
-          The module will be called cros_ec_dev.
+         If you have a supported Chromebook, choose Y or M here.
+         The module will be called cros_ec_dev.

 
 config MFD_MADERA
        tristate "Cirrus Logic Madera codecs"
 
 config MFD_MADERA
        tristate "Cirrus Logic Madera codecs"


@@ -733,6 +743,20 @@ config MFD_MAX77620
          provides common support for accessing the device; additional drivers
          must be enabled in order to use the functionality of the device.
 
          provides common support for accessing the device; additional drivers
          must be enabled in order to use the functionality of the device.
 

+config MFD_MAX77650
+       tristate "Maxim MAX77650/77651 PMIC Support"
+       depends on I2C
+       depends on OF || COMPILE_TEST
+       select MFD_CORE
+       select REGMAP_I2C
+       help
+         Say Y here to add support for Maxim Semiconductor MAX77650 and
+         MAX77651 Power Management ICs. This is the core multifunction
+         driver for interacting with the device. The module name is
+         'max77650'. Additional drivers can be enabled in order to use
+         the following functionalities of the device: GPIO, regulator,
+         charger, LED, onkey.
+

 config MFD_MAX77686
        tristate "Maxim Semiconductor MAX77686/802 PMIC Support"
        depends on I2C
 config MFD_MAX77686
        tristate "Maxim Semiconductor MAX77686/802 PMIC Support"
        depends on I2C


@@ -867,7 +891,7 @@ config MFD_CPCAP
          At least Motorola Droid 4 is known to use CPCAP.
 
 config MFD_VIPERBOARD
          At least Motorola Droid 4 is known to use CPCAP.
 
 config MFD_VIPERBOARD

-        tristate "Nano River Technologies Viperboard"
+       tristate "Nano River Technologies Viperboard"

        select MFD_CORE
        depends on USB
        default n
        select MFD_CORE
        depends on USB
        default n


@@ -903,15 +927,15 @@ config PCF50633_ADC
        tristate "NXP PCF50633 ADC"
        depends on MFD_PCF50633
        help
        tristate "NXP PCF50633 ADC"
        depends on MFD_PCF50633
        help

-        Say yes here if you want to include support for ADC in the
-        NXP PCF50633 chip.
+         Say yes here if you want to include support for ADC in the
+         NXP PCF50633 chip.

 
 config PCF50633_GPIO
        tristate "NXP PCF50633 GPIO"
        depends on MFD_PCF50633
        help
 
 config PCF50633_GPIO
        tristate "NXP PCF50633 GPIO"
        depends on MFD_PCF50633
        help

-        Say yes here if you want to include support GPIO for pins on
-        the PCF50633 chip.
+         Say yes here if you want to include support GPIO for pins on
+         the PCF50633 chip.

 
 config UCB1400_CORE
        tristate "Philips UCB1400 Core driver"
 
 config UCB1400_CORE
        tristate "Philips UCB1400 Core driver"


@@ -1026,7 +1050,7 @@ config MFD_RN5T618
        select REGMAP_I2C
        help
          Say yes here to add support for the Ricoh RN5T567,
        select REGMAP_I2C
        help
          Say yes here to add support for the Ricoh RN5T567,

-          RN5T618, RC5T619 PMIC.
+         RN5T618, RC5T619 PMIC.

          This driver provides common support for accessing the device,
          additional drivers must be enabled in order to use the
          functionality of the device.
          This driver provides common support for accessing the device,
          additional drivers must be enabled in order to use the
          functionality of the device.


@@ -1079,9 +1103,9 @@ config MFD_SM501_GPIO
        bool "Export GPIO via GPIO layer"
        depends on MFD_SM501 && GPIOLIB
         ---help---
        bool "Export GPIO via GPIO layer"
        depends on MFD_SM501 && GPIOLIB
         ---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.
+         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_SKY81452
        tristate "Skyworks Solutions SKY81452"
 
 config MFD_SKY81452
        tristate "Skyworks Solutions SKY81452"


@@ -1096,16 +1120,16 @@ config MFD_SKY81452
          will be called sky81452.
 
 config MFD_SMSC
          will be called sky81452.
 
 config MFD_SMSC

-       bool "SMSC ECE1099 series chips"
-       depends on I2C=y
-       select MFD_CORE
-       select REGMAP_I2C
-       help
-        If you say yes here you get support for the
-        ece1099 chips from SMSC.
+       bool "SMSC ECE1099 series chips"
+       depends on I2C=y
+       select MFD_CORE
+       select REGMAP_I2C
+       help
+         If you say yes here you get support for the
+         ece1099 chips from SMSC.

 
 

-        To compile this driver as a module, choose M here: the
-        module will be called smsc.
+         To compile this driver as a module, choose M here: the
+         module will be called smsc.

 
 config MFD_SC27XX_PMIC
        tristate "Spreadtrum SC27xx PMICs"
 
 config MFD_SC27XX_PMIC
        tristate "Spreadtrum SC27xx PMICs"


@@ -1171,12 +1195,12 @@ config AB8500_CORE
          This chip embeds various other multimedia funtionalities as well.
 
 config AB8500_DEBUG
          This chip embeds various other multimedia funtionalities as well.
 
 config AB8500_DEBUG

-       bool "Enable debug info via debugfs"
-       depends on AB8500_GPADC && DEBUG_FS
-       default y if DEBUG_FS
-       help
-         Select this option if you want debug information using the debug
-         filesystem, debugfs.
+       bool "Enable debug info via debugfs"
+       depends on AB8500_GPADC && DEBUG_FS
+       default y if DEBUG_FS
+       help
+         Select this option if you want debug information using the debug
+         filesystem, debugfs.

 
 config AB8500_GPADC
        bool "ST-Ericsson AB8500 GPADC driver"
 
 config AB8500_GPADC
        bool "ST-Ericsson AB8500 GPADC driver"


@@ -1907,6 +1931,19 @@ config MFD_STPMIC1
          To compile this driver as a module, choose M here: the
          module will be called stpmic1.
 
          To compile this driver as a module, choose M here: the
          module will be called stpmic1.
 

+config MFD_STMFX
+       tristate "Support for STMicroelectronics Multi-Function eXpander (STMFX)"
+       depends on I2C
+       depends on OF || COMPILE_TEST
+       select MFD_CORE
+       select REGMAP_I2C
+       help
+         Support for the STMicroelectronics Multi-Function eXpander.
+
+         This driver provides common support for accessing the device,
+         additional drivers must be enabled in order to use the functionality
+         of the device.
+

 menu "Multimedia Capabilities Port drivers"
        depends on ARCH_SA1100
 
 menu "Multimedia Capabilities Port drivers"
        depends on ARCH_SA1100