Merge remote-tracking branch 'regulator/topic/max8973' into regulator-next

diff --combined drivers/regulator/Kconfig
index e5ce11847befef9dc59d90621533d2bd79923013,2b803123512573d8aa64bd404eadb9d47aac1a6b..551a22b075387a0641d37ff9dc1a34e25b65ee9d
--- 1/drivers/regulator/Kconfig
--- 2/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@@ -109,16 -109,6 +109,16 @@@ config REGULATOR_DA905
          This driver supports the voltage regulators of DA9052-BC and
          DA9053-AA/Bx PMIC.
  
 +config REGULATOR_DA9055
 +      tristate "Dialog Semiconductor DA9055 regulators"
 +      depends on MFD_DA9055
 +      help
 +        Say y here to support the BUCKs and LDOs regulators found on
 +        Dialog Semiconductor DA9055 PMIC.
 +
 +        This driver can also be built as a module. If so, the module
 +        will be called da9055-regulator.
 +
  config REGULATOR_FAN53555
        tristate "Fairchild FAN53555 Regulator"
        depends on I2C
@@@ -214,6 -204,16 +214,16 @@@ config REGULATOR_MAX895
          via I2C bus. Maxim 8952 has one voltage output and supports 4 DVS
          modes ranging from 0.77V to 1.40V by 0.01V steps.
  
+ config REGULATOR_MAX8973
+       tristate "Maxim MAX8973 voltage regulator "
+       depends on I2C
+       select REGMAP_I2C
+       help
+         The MAXIM MAX8973 high-efficiency. three phase, DC-DC step-down
+         switching regulator delievers up to 9A of output current. Each
+         phase operates at a 2MHz fixed frequency with a 120 deg shift
+         from the adjacent phase, allowing the use of small magnetic component.
+ 
  config REGULATOR_MAX8997
        tristate "Maxim 8997/8966 regulator"
        depends on MFD_MAX8997
@@@ -345,17 -345,6 +355,17 @@@ config REGULATOR_PALMA
          on the muxing. This is handled automatically in the driver by
          reading the mux info from OTP.
  
 +config REGULATOR_TPS51632
 +      tristate "TI TPS51632 Power Regulator"
 +      depends on I2C
 +      select REGMAP_I2C
 +      help
 +        This driver supports TPS51632 voltage regulator chip.
 +        The TPS51632 is 3-2-1 Phase D-Cap+ Step Down Driverless Controller
 +        with Serial VID control and DVFS.
 +        The voltage output can be configure through I2C interface or PWM
 +        interface.
 +
  config REGULATOR_TPS6105X
        tristate "TI TPS6105X Power regulators"
        depends on TPS6105X
@@@ -436,15 -425,6 +446,15 @@@ config REGULATOR_TPS6591
        help
            This driver supports TPS65912 voltage regulator chip.
  
 +config REGULATOR_TPS80031
 +      tristate "TI TPS80031/TPS80032 power regualtor driver"
 +      depends on MFD_TPS80031
 +      help
 +        TPS80031/ TPS80032 Fully Integrated Power Management with Power
 +        Path and Battery Charger. It has 5 configurable step-down
 +        converters, 11 general purpose LDOs, VBUS generator and digital
 +        output to control regulators.
 +
  config REGULATOR_TWL4030
        bool "TI TWL4030/TWL5030/TWL6030/TPS659x0 PMIC"
        depends on TWL4030_CORE
@@@ -452,13 -432,6 +462,13 @@@
          This driver supports the voltage regulators provided by
          this family of companion chips.
  
 +config REGULATOR_VEXPRESS
 +      tristate "Versatile Express regulators"
 +      depends on VEXPRESS_CONFIG
 +      help
 +        This driver provides support for voltage regulators available
 +        on the ARM Ltd's Versatile Express platform.
 +
  config REGULATOR_WM831X
        tristate "Wolfson Microelectronics WM831x PMIC regulators"
        depends on MFD_WM831X
@@@ -487,12 -460,5 +497,12 @@@ config REGULATOR_WM899
          This driver provides support for the voltage regulators on the
          WM8994 CODEC.
  
 +config REGULATOR_AS3711
 +      tristate "AS3711 PMIC"
 +      depends on MFD_AS3711
 +      help
 +        This driver provides support for the voltage regulators on the
 +        AS3711 PMIC
 +
  endif
  

diff --combined drivers/regulator/Makefile
index 73bfb873d4b8e60c6d3e3ce1da3087980eddb5ff,3b51e0de33da61dc685b05d50c11febf8c2b8019..b802b0c7fb02d7d7bb3bf3c1fa72b95aed899ce4
--- 1/drivers/regulator/Makefile
--- 2/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@@ -16,10 -16,8 +16,10 @@@ obj-$(CONFIG_REGULATOR_AB8500)      += ab850
  obj-$(CONFIG_REGULATOR_AD5398) += ad5398.o
  obj-$(CONFIG_REGULATOR_ANATOP) += anatop-regulator.o
  obj-$(CONFIG_REGULATOR_ARIZONA) += arizona-micsupp.o arizona-ldo1.o
 +obj-$(CONFIG_REGULATOR_AS3711) += as3711-regulator.o
  obj-$(CONFIG_REGULATOR_DA903X)        += da903x.o
  obj-$(CONFIG_REGULATOR_DA9052)        += da9052-regulator.o
 +obj-$(CONFIG_REGULATOR_DA9055)        += da9055-regulator.o
  obj-$(CONFIG_REGULATOR_DBX500_PRCMU) += dbx500-prcmu.o
  obj-$(CONFIG_REGULATOR_DB8500_PRCMU) += db8500-prcmu.o
  obj-$(CONFIG_REGULATOR_FAN53555) += fan53555.o
@@@ -36,6 -34,7 +36,7 @@@ obj-$(CONFIG_REGULATOR_MAX8660) += max8
  obj-$(CONFIG_REGULATOR_MAX8907) += max8907-regulator.o
  obj-$(CONFIG_REGULATOR_MAX8925) += max8925-regulator.o
  obj-$(CONFIG_REGULATOR_MAX8952) += max8952.o
+ obj-$(CONFIG_REGULATOR_MAX8973) += max8973-regulator.o
  obj-$(CONFIG_REGULATOR_MAX8997) += max8997.o
  obj-$(CONFIG_REGULATOR_MAX8998) += max8998.o
  obj-$(CONFIG_REGULATOR_MAX77686) += max77686.o
@@@ -43,7 -42,6 +44,7 @@@ obj-$(CONFIG_REGULATOR_MC13783) += mc13
  obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
  obj-$(CONFIG_REGULATOR_MC13XXX_CORE) +=  mc13xxx-regulator-core.o
  obj-$(CONFIG_REGULATOR_PALMAS) += palmas-regulator.o
 +obj-$(CONFIG_REGULATOR_TPS51632) += tps51632-regulator.o
  obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o
  obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o
  obj-$(CONFIG_REGULATOR_RC5T583)  += rc5t583-regulator.o
@@@ -59,9 -57,7 +60,9 @@@ obj-$(CONFIG_REGULATOR_TPS6524X) += tps
  obj-$(CONFIG_REGULATOR_TPS6586X) += tps6586x-regulator.o
  obj-$(CONFIG_REGULATOR_TPS65910) += tps65910-regulator.o
  obj-$(CONFIG_REGULATOR_TPS65912) += tps65912-regulator.o
 +obj-$(CONFIG_REGULATOR_TPS80031) += tps80031-regulator.o
  obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o
 +obj-$(CONFIG_REGULATOR_VEXPRESS) += vexpress.o
  obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o
  obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o
  obj-$(CONFIG_REGULATOR_WM831X) += wm831x-ldo.o