Merge remote-tracking branch 'regulator/for-next'

Conflicts:
	Documentation/devicetree/bindings/regulator/tps6586x.txt

diff --cc Documentation/devicetree/bindings/regulator/tps6586x.txt
index ead89260d957e6cd601b404899f86c23922b627e,a2436e1edfc1ea39a76e87becbc65644f106f004..9b05e24b63d0ed724ce2ecc42963f10f754e9bd0
--- 1/Documentation/devicetree/bindings/regulator/tps6586x.txt
--- 2/Documentation/devicetree/bindings/regulator/tps6586x.txt
+++ b/Documentation/devicetree/bindings/regulator/tps6586x.txt
@@@ -18,12 -19,11 +19,15 @@@ Required properties
  - vinldo678-supply: The input supply for the LDO6, LDO7 and LDO8
  - vinldo9-supply: The input supply for the LDO9
  
 +Optional properties:
 +- ti,system-power-controller: Telling whether or not this pmic is controlling
 +  the system power.
 +
  Each regulator is defined using the standard binding for regulators.
  
+ Note: LDO5 and LDO_RTC is supplied by SYS regulator internally and driver
+       take care of making proper parent child relationship.
+ 
  Example:
  
        pmu: tps6586x@34 {
@@@ -34,8 -34,7 +38,9 @@@
                #gpio-cells = <2>;
                gpio-controller;
  
 +              ti,system-power-controller;
 +
+               sys-supply = <&some_reg>;
                vin-sm0-supply = <&some_reg>;
                vin-sm1-supply = <&some_reg>;
                vin-sm2-supply = <&some_reg>;

diff --cc drivers/mfd/tps6586x.c
Simple merge

diff --cc drivers/regulator/Kconfig
index 2ae1d97fac1e6d329f54a9a8ffa6f2a201b29b95,e98a5e7827df86d9b6b691adb07134f26e2a2f0e..67d47b59a66d878c9188afaaa62b92f255d657bb
--- 1/drivers/regulator/Kconfig
--- 2/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@@ -110,9 -109,20 +109,20 @@@ config REGULATOR_DA905
          This driver supports the voltage regulators of DA9052-BC and
          DA9053-AA/Bx PMIC.
  
+ config REGULATOR_FAN53555
+       tristate "Fairchild FAN53555 Regulator"
+       depends on I2C
+       select REGMAP_I2C
+       help
+         This driver supports Fairchild FAN53555 Digitally Programmable
+         TinyBuck Regulator. The FAN53555 is a step-down switching voltage
+         regulator that delivers a digitally programmable output from an
+         input voltage supply of 2.5V to 5.5V. The output voltage is
+         programmed through an I2C interface.
+ 
  config REGULATOR_ANATOP
        tristate "Freescale i.MX on-chip ANATOP LDO regulators"
 -      depends on MFD_ANATOP
 +      depends on MFD_SYSCON
        help
          Say y here to support Freescale i.MX on-chip ANATOP LDOs
          regulators. It is recommended that this option be

diff --cc drivers/regulator/ab3100.c
Simple merge

diff --cc drivers/regulator/palmas-regulator.c
Simple merge

diff --cc drivers/regulator/wm831x-dcdc.c
Simple merge

diff --cc drivers/regulator/wm831x-ldo.c
Simple merge

diff --cc include/linux/mfd/tps6586x.h
Simple merge