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

diff --combined drivers/regulator/Kconfig
index 9744437afe32424e5a86eff4b0810f61c35dff9e,9296425103ef6602e696f1c498b993940ef65f39..f1e6ad98eebaa2c784a748e700785af479b80e96
--- 1/drivers/regulator/Kconfig
--- 2/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@@ -250,15 -250,6 +250,15 @@@ config REGULATOR_MAX7768
          via I2C bus. The provided regulator is suitable for
          Exynos-4 chips to control VARM and VINT voltages.
  
 +config REGULATOR_MAX77693
 +      tristate "Maxim MAX77693 regulator"
 +      depends on MFD_MAX77693
 +      help
 +        This driver controls a Maxim 77693 regulator via I2C bus.
 +        The regulators include two LDOs, 'SAFEOUT1', 'SAFEOUT2'
 +        and one current regulator 'CHARGER'. This is suitable for
 +        Exynos-4x12 chips.
 +
  config REGULATOR_PCAP
        tristate "Motorola PCAP2 regulator driver"
        depends on EZX_PCAP
@@@ -481,6 -472,16 +481,16 @@@ config REGULATOR_TWL403
          This driver supports the voltage regulators provided by
          this family of companion chips.
  
+ config REGULATOR_TI_ABB
+       bool "TI Adaptive Body Bias on-chip LDO"
+       depends on ARCH_OMAP
+       help
+         Select this option to support Texas Instruments' on-chip Adaptive Body
+         Bias (ABB) LDO regulators. It is recommended that this option be
+         enabled on required TI SoC. Certain Operating Performance Points
+         on TI SoCs may be unstable without enabling this as it provides
+         device specific optimized bias to allow/optimize functionality.
+ 
  config REGULATOR_VEXPRESS
        tristate "Versatile Express regulators"
        depends on VEXPRESS_CONFIG

diff --combined drivers/regulator/Makefile
index c4b50fc7f44fd9e04290e62676e0a1aa24c09a0f,95350e890973602036e95a8b3fa059abcd39e828..ba4a3cf3afec57eef79179abf72ae1f51d5b3073
--- 1/drivers/regulator/Makefile
--- 2/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@@ -12,7 -12,7 +12,7 @@@ obj-$(CONFIG_REGULATOR_USERSPACE_CONSUM
  obj-$(CONFIG_REGULATOR_88PM8607) += 88pm8607.o
  obj-$(CONFIG_REGULATOR_AAT2870) += aat2870-regulator.o
  obj-$(CONFIG_REGULATOR_AB3100) += ab3100.o
 -obj-$(CONFIG_REGULATOR_AB8500)        += ab8500.o ab8500-ext.o
 +obj-$(CONFIG_REGULATOR_AB8500)        += ab8500-ext.o ab8500.o
  obj-$(CONFIG_REGULATOR_AD5398) += ad5398.o
  obj-$(CONFIG_REGULATOR_ANATOP) += anatop-regulator.o
  obj-$(CONFIG_REGULATOR_ARIZONA) += arizona-micsupp.o arizona-ldo1.o
@@@ -41,7 -41,6 +41,7 @@@ obj-$(CONFIG_REGULATOR_MAX8973) += max8
  obj-$(CONFIG_REGULATOR_MAX8997) += max8997.o
  obj-$(CONFIG_REGULATOR_MAX8998) += max8998.o
  obj-$(CONFIG_REGULATOR_MAX77686) += max77686.o
 +obj-$(CONFIG_REGULATOR_MAX77693) += max77693.o
  obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o
  obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
  obj-$(CONFIG_REGULATOR_MC13XXX_CORE) +=  mc13xxx-regulator-core.o
@@@ -64,6 -63,7 +64,7 @@@ obj-$(CONFIG_REGULATOR_TPS65910) += tps
  obj-$(CONFIG_REGULATOR_TPS65912) += tps65912-regulator.o
  obj-$(CONFIG_REGULATOR_TPS80031) += tps80031-regulator.o
  obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o
+ obj-$(CONFIG_REGULATOR_TI_ABB) += ti-abb-regulator.o
  obj-$(CONFIG_REGULATOR_VEXPRESS) += vexpress.o
  obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o
  obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o