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

diff --combined drivers/regulator/Kconfig
index d54044c03a6cfbe91a968798d0c2e95d2e10a56e,da83a3abe288ea87fc994a5e6caa1ed649754b38..48db87d6dfef4d0bc6f2037feeab7cf88c7949c5
--- 1/drivers/regulator/Kconfig
--- 2/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@@ -125,20 -125,12 +125,20 @@@ config REGULATOR_AB850
          This driver supports the regulators found on the ST-Ericsson mixed
          signal AB8500 PMIC
  
 -config REGULATOR_ARIZONA
 -      tristate "Wolfson Arizona class devices"
 +config REGULATOR_ARIZONA_LDO1
 +      tristate "Wolfson Arizona class devices LDO1"
        depends on MFD_ARIZONA
        depends on SND_SOC
        help
 -        Support for the regulators found on Wolfson Arizona class
 +        Support for the LDO1 regulators found on Wolfson Arizona class
 +        devices.
 +
 +config REGULATOR_ARIZONA_MICSUPP
 +      tristate "Wolfson Arizona class devices MICSUPP"
 +      depends on MFD_ARIZONA
 +      depends on SND_SOC
 +      help
 +        Support for the MICSUPP regulators found on Wolfson Arizona class
          devices.
  
  config REGULATOR_AS3711
@@@ -171,24 -163,6 +171,24 @@@ config REGULATOR_BCM590X
          BCM590xx PMUs. This will enable support for the software
          controllable LDO/Switching regulators.
  
 +config REGULATOR_BD9571MWV
 +      tristate "ROHM BD9571MWV Regulators"
 +      depends on MFD_BD9571MWV
 +      help
 +        This driver provides support for the voltage regulators on the
 +        ROHM BD9571MWV PMIC. This will enable support for the software
 +        controllable regulator and voltage sampling units.
 +
 +        This driver can also be built as a module. If so, the module
 +        will be called bd9571mwv-regulator.
 +
 +config REGULATOR_CPCAP
 +      tristate "Motorola CPCAP regulator"
 +      depends on MFD_CPCAP
 +      help
 +        Say y here for CPCAP regulator found on some Motorola phones
 +        and tablets such as Droid 4.
 +
  config REGULATOR_DA903X
        tristate "Dialog Semiconductor DA9030/DA9034 regulators"
        depends on PMIC_DA903X
@@@ -807,14 -781,6 +807,14 @@@ config REGULATOR_TPS6509
          This driver provides support for the voltage regulators on the
          TI TPS65090 PMIC.
  
 +config REGULATOR_TPS65132
 +      tristate "TI TPS65132 Dual Output Power regulators"
 +      depends on I2C && GPIOLIB
 +      select REGMAP_I2C
 +      help
 +        This driver supports TPS65132 single inductor - dual output
 +        power supply specifcally designed for display panels.
 +
  config REGULATOR_TPS65217
        tristate "TI TPS65217 Power regulators"
        depends on MFD_TPS65217
@@@ -877,6 -843,13 +877,13 @@@ config REGULATOR_TWL403
          This driver supports the voltage regulators provided by
          this family of companion chips.
  
+ config REGULATOR_VCTRL
+       tristate "Voltage controlled regulators"
+       depends on OF
+       help
+         This driver provides support for voltage regulators whose output
+         voltage is controlled by the voltage of another regulator.
+ 
  config REGULATOR_VEXPRESS
        tristate "Versatile Express regulators"
        depends on VEXPRESS_CONFIG

diff --combined drivers/regulator/Makefile
index f30cb0e2d6fb4f236faf1699415e8cd3f179744a,e246e148a7f9bf94f990d9f01960b2a973669a23..dc3503fb3e30c0980acc4fe850302d0e91fd20a8
--- 1/drivers/regulator/Makefile
--- 2/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@@ -11,7 -11,6 +11,7 @@@ obj-$(CONFIG_REGULATOR_USERSPACE_CONSUM
  
  obj-$(CONFIG_REGULATOR_88PM800) += 88pm800.o
  obj-$(CONFIG_REGULATOR_88PM8607) += 88pm8607.o
 +obj-$(CONFIG_REGULATOR_CPCAP) += cpcap-regulator.o
  obj-$(CONFIG_REGULATOR_AAT2870) += aat2870-regulator.o
  obj-$(CONFIG_REGULATOR_AB3100) += ab3100.o
  obj-$(CONFIG_REGULATOR_AB8500)        += ab8500-ext.o ab8500.o
@@@ -19,13 -18,11 +19,13 @@@ obj-$(CONFIG_REGULATOR_ACT8865) += act8
  obj-$(CONFIG_REGULATOR_ACT8945A) += act8945a-regulator.o
  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_ARIZONA_LDO1) += arizona-ldo1.o
 +obj-$(CONFIG_REGULATOR_ARIZONA_MICSUPP) += arizona-micsupp.o
  obj-$(CONFIG_REGULATOR_AS3711) += as3711-regulator.o
  obj-$(CONFIG_REGULATOR_AS3722) += as3722-regulator.o
  obj-$(CONFIG_REGULATOR_AXP20X) += axp20x-regulator.o
  obj-$(CONFIG_REGULATOR_BCM590XX) += bcm590xx-regulator.o
 +obj-$(CONFIG_REGULATOR_BD9571MWV) += bd9571mwv-regulator.o
  obj-$(CONFIG_REGULATOR_DA903X)        += da903x.o
  obj-$(CONFIG_REGULATOR_DA9052)        += da9052-regulator.o
  obj-$(CONFIG_REGULATOR_DA9055)        += da9055-regulator.o
@@@ -107,8 -104,8 +107,9 @@@ obj-$(CONFIG_REGULATOR_TPS6586X) += tps
  obj-$(CONFIG_REGULATOR_TPS65910) += tps65910-regulator.o
  obj-$(CONFIG_REGULATOR_TPS65912) += tps65912-regulator.o
  obj-$(CONFIG_REGULATOR_TPS80031) += tps80031-regulator.o
 +obj-$(CONFIG_REGULATOR_TPS65132) += tps65132-regulator.o
  obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o twl6030-regulator.o
+ obj-$(CONFIG_REGULATOR_VCTRL) += vctrl-regulator.o
  obj-$(CONFIG_REGULATOR_VEXPRESS) += vexpress-regulator.o
  obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o
  obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o