Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (22 commits)
  regulator: Remove default DEBUG define from TPS6586x
  regulator: tps6507x - add missing platform_set_drvdata in tps6507x_pmic_probe
  regulator: tps6586x - add regulator_unregister() in tps6586x_regulator_remove()
  mfd: max8998 - fix incorrect kfree(i2c) in i2c_driver probe callback handler
  regulator: lp3971 - remove unnecessary ret value checking in lp3971_i2c_write()
  regulator: max8660 - fix a memory leak in max8660_remove()
  regulator: max1586 - fix a memory leak in max1586_pmic_remove()
  regulator: Default GPIO controlled WM8994 regulators to disabled
  regulator: lp3971 - remove unnecessary ret value checking in lp3971_i2c_write()
  max8998: fix off-by-one value range checking
  regulator: tps6586x: fix millivolt return values and SM2 table
  regulator: tps6586x: add dependancy on MFD_TPS6585x
  regulator: add TPS6586X regulator driver
  regulator: MAX8998: set_voltage bugfix. ramp_up delay and min/max voltage
  regulator: add support for regulators on the ab8500 MFD
  ab8500-mfd: add regulator support to ab8500 mfd device
  tps65023: Allow registering similar TPS65021
  drivers: regulators: depend on MFD_MAX8998
  drivers: regulator: add Maxim 8998 driver
  ISL6271A voltage regulator support.
  ...

diff --combined drivers/mfd/Kconfig
index d75909e,ad61a9e..db51ea1
--- 1/drivers/mfd/Kconfig
--- 2/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@@ -7,16 -7,7 +7,16 @@@ menuconfig MFD_SUPPOR
        depends on HAS_IOMEM
        default y
        help
 -        Configure MFD device drivers.
 +        Multifunction devices embed several functions (e.g. GPIOs,
 +        touchscreens, keyboards, current regulators, power management chips,
 +        etc...) in one single integrated circuit. They usually talk to the
 +        main CPU through one or more IRQ lines and low speed data busses (SPI,
 +        I2C, etc..). They appear as one single device to the main system
 +        through the data bus and the MFD framework allows for sub devices
 +        (a.k.a. functions) to appear as discrete platform devices.
 +        MFDs are typically found on embedded platforms.
 +
 +        This option alone does not add any kernel code.
  
  if MFD_SUPPORT
  
@@@ -186,38 -177,6 +186,38 @@@ config TWL4030_CODE
        select MFD_CORE
        default n
  
 +config TWL6030_PWM
 +      tristate "TWL6030 PWM (Pulse Width Modulator) Support"
 +      depends on TWL4030_CORE
 +      select HAVE_PWM
 +      default n
 +      help
 +        Say yes here if you want support for TWL6030 PWM.
 +        This is used to control charging LED brightness.
 +
 +config MFD_STMPE
 +      bool "Support STMicroelectronics STMPE"
 +      depends on I2C=y && GENERIC_HARDIRQS
 +      select MFD_CORE
 +      help
 +        Support for the STMPE family of I/O Expanders from
 +        STMicroelectronics.
 +
 +        Currently supported devices are:
 +
 +              STMPE811: GPIO, Touchscreen
 +              STMPE1601: GPIO, Keypad
 +              STMPE2401: GPIO, Keypad
 +              STMPE2403: GPIO, Keypad
 +
 +        This driver provides common support for accessing the device,
 +        additional drivers must be enabled in order to use the functionality
 +        of the device.  Currently available sub drivers are:
 +
 +              GPIO: stmpe-gpio
 +              Keypad: stmpe-keypad
 +              Touchscreen: stmpe-ts
 +
  config MFD_TC35892
        bool "Support Toshiba TC35892"
        depends on I2C=y && GENERIC_HARDIRQS
@@@ -293,6 -252,16 +293,16 @@@ config MFD_MAX892
          accessing the device, additional drivers must be enabled in order
          to use the functionality of the device.
  
+ config MFD_MAX8998
+       bool "Maxim Semiconductor MAX8998 PMIC Support"
+       depends on I2C=y
+       select MFD_CORE
+       help
+         Say yes here to support for Maxim Semiconductor MAX8998. 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
@@@ -523,28 -492,6 +533,28 @@@ config MFD_JANZ_CMODI
          host many different types of MODULbus daughterboards, including
          CAN and GPIO controllers.
  
 +config MFD_JZ4740_ADC
 +      tristate "Support for the JZ4740 SoC ADC core"
 +      select MFD_CORE
 +      depends on MACH_JZ4740
 +      help
 +        Say yes here if you want support for the ADC unit in the JZ4740 SoC.
 +        This driver is necessary for jz4740-battery and jz4740-hwmon driver.
 +
 +config MFD_TPS6586X
 +      tristate "TPS6586x Power Management chips"
 +      depends on I2C && GPIOLIB
 +      select MFD_CORE
 +      help
 +        If you say yes here you get support for the TPS6586X series of
 +        Power Management chips.
 +        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 can also be built as a module.  If so, the module
 +        will be called tps6586x.
 +
  endif # MFD_SUPPORT
  
  menu "Multimedia Capabilities Port drivers"

diff --combined drivers/mfd/Makefile
index 1e48d7e,a362ccf..feaeeae
--- 1/drivers/mfd/Makefile
--- 2/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@@ -15,7 -15,6 +15,7 @@@ obj-$(CONFIG_HTC_I2CPLD)      += htc-i2cpld.
  obj-$(CONFIG_MFD_DAVINCI_VOICECODEC)  += davinci_voicecodec.o
  obj-$(CONFIG_MFD_DM355EVM_MSP)        += dm355evm_msp.o
  
 +obj-$(CONFIG_MFD_STMPE)               += stmpe.o
  obj-$(CONFIG_MFD_TC35892)     += tc35892.o
  obj-$(CONFIG_MFD_T7L66XB)     += t7l66xb.o tmio_core.o
  obj-$(CONFIG_MFD_TC6387XB)    += tc6387xb.o tmio_core.o
@@@ -37,7 -36,6 +37,7 @@@ obj-$(CONFIG_MENELAUS)                += menelaus.
  obj-$(CONFIG_TWL4030_CORE)    += twl-core.o twl4030-irq.o twl6030-irq.o
  obj-$(CONFIG_TWL4030_POWER)    += twl4030-power.o
  obj-$(CONFIG_TWL4030_CODEC)   += twl4030-codec.o
 +obj-$(CONFIG_TWL6030_PWM)     += twl6030-pwm.o
  
  obj-$(CONFIG_MFD_MC13783)     += mc13783-core.o
  
@@@ -58,6 -56,7 +58,7 @@@ obj-$(CONFIG_UCB1400_CORE)    += ucb1400_c
  obj-$(CONFIG_PMIC_DA903X)     += da903x.o
  max8925-objs                  := max8925-core.o max8925-i2c.o
  obj-$(CONFIG_MFD_MAX8925)     += max8925.o
+ obj-$(CONFIG_MFD_MAX8998)     += max8998.o
  
  pcf50633-objs                 := pcf50633-core.o pcf50633-irq.o
  obj-$(CONFIG_MFD_PCF50633)    += pcf50633.o
@@@ -73,5 -72,3 +74,5 @@@ obj-$(CONFIG_PMIC_ADP5520)    += adp5520.
  obj-$(CONFIG_LPC_SCH)         += lpc_sch.o
  obj-$(CONFIG_MFD_RDC321X)     += rdc321x-southbridge.o
  obj-$(CONFIG_MFD_JANZ_CMODIO) += janz-cmodio.o
 +obj-$(CONFIG_MFD_JZ4740_ADC)  += jz4740-adc.o
 +obj-$(CONFIG_MFD_TPS6586X)    += tps6586x.o