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

Conflicts:
	Documentation/devicetree/bindings/regulator/tps6586x.txt
	drivers/mfd/88pm860x-core.c
	drivers/mfd/max8925-core.c
	drivers/mfd/tc3589x.c
	drivers/regulator/anatop-regulator.c

diff --cc Documentation/devicetree/bindings/regulator/tps6586x.txt
index da80c2ae0915e338af82e995ad64d78fdce82add,03dfa4e0aa75e9406e1eabb7e5a6806a9afc2cc1..ead89260d957e6cd601b404899f86c23922b627e
--- 1/Documentation/devicetree/bindings/regulator/tps6586x.txt
--- 2/Documentation/devicetree/bindings/regulator/tps6586x.txt
+++ b/Documentation/devicetree/bindings/regulator/tps6586x.txt
@@@ -30,9 -34,11 +34,11 @@@ Example
                #gpio-cells = <2>;
                gpio-controller;
  
 -              sm0-supply = <&some_reg>;
 -              sm1-supply = <&some_reg>;
 -              sm2-supply = <&some_reg>;
+               ti,system-power-controller;
+ 
 +              vin-sm0-supply = <&some_reg>;
 +              vin-sm1-supply = <&some_reg>;
 +              vin-sm2-supply = <&some_reg>;
                vinldo01-supply = <...>;
                vinldo23-supply = <...>;
                vinldo4-supply = <...>;

diff --cc arch/arm/mach-imx/mach-imx6q.c
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/mfd/Kconfig
Simple merge

diff --cc drivers/pwm/Kconfig
Simple merge

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

diff --cc drivers/regulator/anatop-regulator.c
index ce0fe72a428e811418aa8190c7f534ce1009d5a4,596535dd917a7d061a48a648350b237885634f5f..1af97686f4448864d92b7dbfdf58e79c883edbb8
--- 1/drivers/regulator/anatop-regulator.c
--- 2/drivers/regulator/anatop-regulator.c
+++ b/drivers/regulator/anatop-regulator.c
@@@ -61,18 -64,17 +64,18 @@@ static int anatop_regmap_set_voltage_se
        return 0;
  }
  
- static int anatop_get_voltage_sel(struct regulator_dev *reg)
+ static int anatop_regmap_get_voltage_sel(struct regulator_dev *reg)
  {
        struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);
 -      u32 val;
 +      u32 val, mask;
  
        if (!anatop_reg->control_reg)
                return -ENOTSUPP;
  
-       val = anatop_read_reg(anatop_reg->mfd, anatop_reg->control_reg);
+       regmap_read(anatop_reg->anatop, anatop_reg->control_reg, &val);
 -      val = (val & ((1 << anatop_reg->vol_bit_width) - 1)) >>
 +      mask = ((1 << anatop_reg->vol_bit_width) - 1) <<
                anatop_reg->vol_bit_shift;
 +      val = (val & mask) >> anatop_reg->vol_bit_shift;
  
        return val - anatop_reg->min_bit_val;
  }

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

diff --cc include/linux/of.h
Simple merge