From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 28 Sep 2012 02:39:04 +0000 (+1000)
Subject: Merge remote-tracking branch 'mfd/for-next'
X-Git-Tag: next-20120928~50
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9d363b6b9ad4f7de490855645931bb806ed679ae;p=karo-tx-linux.git

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/mfd/tps65217.c
	drivers/regulator/anatop-regulator.c
---

9d363b6b9ad4f7de490855645931bb806ed679ae
diff --cc Documentation/devicetree/bindings/regulator/tps6586x.txt
index da80c2ae0915,03dfa4e0aa75..ead89260d957
--- a/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;
  
+ 		ti,system-power-controller;
+ 
 -		sm0-supply = <&some_reg>;
 -		sm1-supply = <&some_reg>;
 -		sm2-supply = <&some_reg>;
 +		vin-sm0-supply = <&some_reg>;
 +		vin-sm1-supply = <&some_reg>;
 +		vin-sm2-supply = <&some_reg>;
  		vinldo01-supply = <...>;
  		vinldo23-supply = <...>;
  		vinldo4-supply = <...>;
diff --cc drivers/regulator/anatop-regulator.c
index ce0fe72a428e,596535dd917a..1af97686f444
--- a/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;
  }