Merge remote-tracking branches 'regulator/topic/s2mps11', 'regulator/topic/s2mpu02...

diff --combined drivers/mfd/Kconfig
index 6cc4b6acc22ab3996ef1f828fb5a87626a9c8bde,ee8204cc31e916dbd344ca2c0a3a93135ab64cd5,2feac14d1085cbb5a7e5b621d6e3ae42e25d6e58,ee8204cc31e916dbd344ca2c0a3a93135ab64cd5,ee8204cc31e916dbd344ca2c0a3a93135ab64cd5..fb824f5011979f056b9e9abf88c2590f0923d557
--- 1/drivers/mfd/Kconfig
--- 2/drivers/mfd/Kconfig
--- 3/drivers/mfd/Kconfig
--- 4/drivers/mfd/Kconfig
--- 5/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@@@@@ -384,6 -384,6 -384,7 -384,6 -384,6 +384,7 @@@@@@ config MFD_MAX7769
        depends on I2C=y
        select MFD_CORE
        select REGMAP_I2C
++ ++   select REGMAP_IRQ
        help
          Say yes here to add support for Maxim Semiconductor MAX77693.
          This is a companion Power Management IC with Flash, Haptic, Charger,
@@@@@@ -760,7 -760,6 -761,6 -760,6 -760,6 +761,7 @@@@@@ config MFD_SYSCO
     config MFD_DAVINCI_VOICECODEC
        tristate
        select MFD_CORE
 ++++   select REGMAP_MMIO
     
     config MFD_TI_AM335X_TSCADC
        tristate "TI ADC / Touch Screen chip support"
@@@@@@ -1226,7 -1225,7 -1226,7 -1225,7 -1225,7 +1227,7 @@@@@@ config MFD_WM899
          functionaltiy of the device other drivers must be enabled.
     
     config MFD_STW481X
 ----   bool "Support for ST Microelectronics STw481x"
 ++++   tristate "Support for ST Microelectronics STw481x"
        depends on I2C && ARCH_NOMADIK
        select REGMAP_I2C
        select MFD_CORE
@@@@@@ -1249,7 -1248,7 -1249,7 -1248,7 -1248,7 +1250,7 @@@@@@ config MCP_SA11X
     
     # Chip drivers
     config MCP_UCB1200
 ----   bool "Support for UCB1200 / UCB1300"
 ++++   tristate "Support for UCB1200 / UCB1300"
        depends on MCP_SA11X0
        select MCP
     

diff --combined drivers/regulator/Kconfig
index f5040fc49a3a63aa3df6a5cf665f8462015207ee,203c02d7f2834e3bed8b90b258c56ecf8fe6ded2,789eb46090e3ffe22de72845fe8edf8f32a907d3,789eb46090e3ffe22de72845fe8edf8f32a907d3,789eb46090e3ffe22de72845fe8edf8f32a907d3..2dc8289e5dba772be498e084505c72d89491b3fb
--- 1/drivers/regulator/Kconfig
--- 2/drivers/regulator/Kconfig
--- 3/drivers/regulator/Kconfig
--- 4/drivers/regulator/Kconfig
--- 5/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@@@@@ -196,18 -196,8 -196,8 -196,8 -196,8 +196,18 @@@@@@ config REGULATOR_DA921
          Say y here to support for the Dialog Semiconductor DA9210.
          The DA9210 is a multi-phase synchronous step down
          converter 12A DC-DC Buck controlled through an I2C
 +        interface.
 +   
 ++++config REGULATOR_DA9211
 ++++   tristate "Dialog Semiconductor DA9211/DA9212 regulator"
 ++++   depends on I2C
 ++++   select REGMAP_I2C
 ++++   help
 ++++     Say y here to support for the Dialog Semiconductor DA9211/DA9212.
 ++++     The DA9211/DA9212 is a multi-phase synchronous step down
 ++++     converter 12A DC-DC Buck controlled through an I2C
  +++     interface.
  +++
     config REGULATOR_DBX500_PRCMU
        bool
     
@@@@@@ -467,10 -457,10 -457,10 -457,10 -457,10 +467,10 @@@@@@ config REGULATOR_S2MPA0
         via I2C bus. S2MPA01 has 10 Bucks and 26 LDO outputs.
     
     config REGULATOR_S2MPS11
- ---   tristate "Samsung S2MPS11/S2MPS14 voltage regulator"
+ +++   tristate "Samsung S2MPS11/S2MPS14/S2MPU02 voltage regulator"
        depends on MFD_SEC_CORE
        help
- ---    This driver supports a Samsung S2MPS11/S2MPS14 voltage output
+ +++    This driver supports a Samsung S2MPS11/S2MPS14/S2MPU02 voltage output
         regulator via I2C bus. The chip is comprised of high efficient Buck
         converters including Dual-Phase Buck converter, Buck-Boost converter,
         various LDOs.