Merge remote-tracking branches 'regulator/topic/max1586', 'regulator/topic/max77802...

diff --combined drivers/regulator/Kconfig
index 40eab775047e41cb0bdf962752ce891fef5740e0,2dc8289e5dba772be498e084505c72d89491b3fb,8134a99e2a0928a7cac580c4b9feb9d54e9c7f6e,2dc8289e5dba772be498e084505c72d89491b3fb..58a6ec1253271a60984edb5b0c90c459072e4f33
--- 1/drivers/regulator/Kconfig
--- 2/drivers/regulator/Kconfig
--- 3/drivers/regulator/Kconfig
--- 4/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@@@@ -199,14 -199,13 -199,13 -199,13 +199,14 @@@@@ config REGULATOR_DA921
          interface.
    
    config REGULATOR_DA9211
 ---    tristate "Dialog Semiconductor DA9211/DA9212 regulator"
 +++    tristate "Dialog Semiconductor DA9211/DA9212/DA9213/DA9214 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
 +++      Say y here to support for the Dialog Semiconductor DA9211/DA9212
 +++      /DA9213/DA9214.
 +++      The DA9211/DA9212/DA9213/DA9214 is a multi-phase synchronous
 +++      step down converter 12A or 16A DC-DC Buck controlled through an I2C
          interface.
    
    config REGULATOR_DBX500_PRCMU
@@@@@ -241,23 -240,6 -240,6 -240,6 +241,23 @@@@@ config REGULATOR_GPI
          and the platform has to provide a mapping of GPIO-states
          to target volts/amps.
    
 +++config REGULATOR_HI6421
 +++    tristate "HiSilicon Hi6421 PMIC voltage regulator support"
 +++    depends on MFD_HI6421_PMIC && OF
 +++    help
 +++      This driver provides support for the voltage regulators on the
 +++      HiSilicon Hi6421 PMU / Codec IC.
 +++      Hi6421 is a multi-function device which, on regulator part, provides
 +++      21 general purpose LDOs, 3 dedicated LDOs, and 5 BUCKs. All
 +++      of them come with support to either ECO (idle) or sleep mode.
 +++
 +++config REGULATOR_ISL9305
 +++    tristate "Intersil ISL9305 regulator"
 +++    depends on I2C
 +++    select REGMAP_I2C
 +++    help
 +++      This driver supports ISL9305 voltage regulator chip.
 +++
    config REGULATOR_ISL6271A
        tristate "Intersil ISL6271A Power regulator"
        depends on I2C
@@@@@ -405,6 -387,6 -387,15 -387,6 +405,15 @@@@@ config REGULATOR_MAX7769
          and one current regulator 'CHARGER'. This is suitable for
          Exynos-4x12 chips.
    
++ +config REGULATOR_MAX77802
++ +    tristate "Maxim 77802 regulator"
++ +    depends on MFD_MAX77686
++ +    help
++ +      This driver controls a Maxim 77802 regulator
++ +      via I2C bus. The provided regulator is suitable for
++ +      Exynos5420/Exynos5800 SoCs to control various voltages.
++ +      It includes support for control of voltage and ramp speed.
++ +
    config REGULATOR_MC13XXX_CORE
        tristate
    
@@@@@ -467,25 -449,6 -458,6 -449,6 +476,25 @@@@@ config REGULATOR_PFUZE10
          Say y here to support the regulators found on the Freescale
          PFUZE100/PFUZE200 PMIC.
    
 +++config REGULATOR_PWM
 +++    tristate "PWM voltage regulator"
 +++    depends on PWM
 +++    help
 +++      This driver supports PWM controlled voltage regulators. PWM
 +++      duty cycle can increase or decrease the voltage.
 +++
 +++config REGULATOR_QCOM_RPM
 +++    tristate "Qualcomm RPM regulator driver"
 +++    depends on MFD_QCOM_RPM
 +++    help
 +++      If you say yes to this option, support will be included for the
 +++      regulators exposed by the Resource Power Manager found in Qualcomm
 +++      8660, 8960 and 8064 based devices.
 +++
 +++      Say M here if you want to include support for the regulators on the
 +++      Qualcomm RPM as a module. The module will be named
 +++      "qcom_rpm-regulator".
 +++
    config REGULATOR_RC5T583
        tristate "RICOH RC5T583 Power regulators"
        depends on MFD_RC5T583
@@@@@ -520,16 -483,11 -492,11 -483,11 +529,16 @@@@@ config REGULATOR_S5M876
         via I2C bus. S5M8767A have 9 Bucks and 28 LDOs output and
         supports DVS mode with 8bits of output voltage control.
    
 ---config REGULATOR_ST_PWM
 ---    tristate "STMicroelectronics PWM voltage regulator"
 ---    depends on ARCH_STI
 +++config REGULATOR_SKY81452
 +++    tristate "Skyworks Solutions SKY81452 voltage regulator"
 +++    depends on SKY81452
        help
 ---     This driver supports ST's PWM controlled voltage regulators.
 +++      This driver supports Skyworks SKY81452 voltage output regulator
 +++      via I2C bus. SKY81452 has one voltage linear regulator can be
 +++      programmed from 4.5V to 20V.
 +++
 +++      This driver can also be built as a module. If so, the module
 +++      will be called sky81452-regulator.
    
    config REGULATOR_TI_ABB
        tristate "TI Adaptive Body Bias on-chip LDO"

diff --combined drivers/regulator/Makefile
index 662834856c3769908f7e360258e47b78682a328e,aa4a6aa7b55827b4dab12789e40b97c5443ee8a0,b4ec6c85307c34be7da9d8f9e40d1b0a9bf2385d,aa4a6aa7b55827b4dab12789e40b97c5443ee8a0..f0e227d4f5a5ea11643cd389a5792289a3a54fff
--- 1/drivers/regulator/Makefile
--- 2/drivers/regulator/Makefile
--- 3/drivers/regulator/Makefile
--- 4/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@@@@ -32,9 -32,7 -32,7 -32,7 +32,9 @@@@@ obj-$(CONFIG_REGULATOR_DBX500_PRCMU) +
    obj-$(CONFIG_REGULATOR_DB8500_PRCMU) += db8500-prcmu.o
    obj-$(CONFIG_REGULATOR_FAN53555) += fan53555.o
    obj-$(CONFIG_REGULATOR_GPIO) += gpio-regulator.o
 +++obj-$(CONFIG_REGULATOR_HI6421) += hi6421-regulator.o
    obj-$(CONFIG_REGULATOR_ISL6271A) += isl6271a-regulator.o
 +++obj-$(CONFIG_REGULATOR_ISL9305) += isl9305.o
    obj-$(CONFIG_REGULATOR_LP3971) += lp3971.o
    obj-$(CONFIG_REGULATOR_LP3972) += lp3972.o
    obj-$(CONFIG_REGULATOR_LP872X) += lp872x.o
@@@@@ -54,13 -52,11 -52,12 -52,11 +54,14 @@@@@ obj-$(CONFIG_REGULATOR_MAX8997) += max8
    obj-$(CONFIG_REGULATOR_MAX8998) += max8998.o
    obj-$(CONFIG_REGULATOR_MAX77686) += max77686.o
    obj-$(CONFIG_REGULATOR_MAX77693) += max77693.o
++ +obj-$(CONFIG_REGULATOR_MAX77802) += max77802.o
    obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o
    obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
    obj-$(CONFIG_REGULATOR_MC13XXX_CORE) +=  mc13xxx-regulator-core.o
 +++obj-$(CONFIG_REGULATOR_QCOM_RPM) += qcom_rpm-regulator.o
    obj-$(CONFIG_REGULATOR_PALMAS) += palmas-regulator.o
    obj-$(CONFIG_REGULATOR_PFUZE100) += pfuze100-regulator.o
 +++obj-$(CONFIG_REGULATOR_PWM) += pwm-regulator.o
    obj-$(CONFIG_REGULATOR_TPS51632) += tps51632-regulator.o
    obj-$(CONFIG_REGULATOR_PBIAS) += pbias-regulator.o
    obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o
@@@@@ -69,7 -65,7 -66,7 -65,7 +70,7 @@@@@ obj-$(CONFIG_REGULATOR_RC5T583)  += rc5
    obj-$(CONFIG_REGULATOR_S2MPA01) += s2mpa01.o
    obj-$(CONFIG_REGULATOR_S2MPS11) += s2mps11.o
    obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o
 ---obj-$(CONFIG_REGULATOR_ST_PWM) += st-pwm.o
 +++obj-$(CONFIG_REGULATOR_SKY81452) += sky81452-regulator.o
    obj-$(CONFIG_REGULATOR_STW481X_VMMC) += stw481x-vmmc.o
    obj-$(CONFIG_REGULATOR_TI_ABB) += ti-abb-regulator.o
    obj-$(CONFIG_REGULATOR_TPS6105X) += tps6105x-regulator.o