From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 10 Apr 2012 08:52:59 +0000 (+0100)
Subject: Merge tag 'v3.4-rc2' into regulator-drivers
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b920eb41a8241c54efbbd4f2ed6d074f497b0d9e;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'v3.4-rc2' into regulator-drivers

Linux 3.4-rc2 contains some fixes that further patches depend upon.
---

b920eb41a8241c54efbbd4f2ed6d074f497b0d9e
diff --cc drivers/regulator/tps6586x-regulator.c
index deb855c41e16,cfc1f16f7771..9a4029a446d3
--- a/drivers/regulator/tps6586x-regulator.c
+++ b/drivers/regulator/tps6586x-regulator.c
@@@ -75,9 -75,15 +75,14 @@@ static inline struct device *to_tps6586
  	return rdev_get_dev(rdev)->parent->parent;
  }
  
 -static int tps6586x_ldo_list_voltage(struct regulator_dev *rdev,
 -				     unsigned selector)
 +static int tps6586x_list_voltage(struct regulator_dev *rdev, unsigned selector)
  {
  	struct tps6586x_regulator *info = rdev_get_drvdata(rdev);
+ 	int rid = rdev_get_id(rdev);
+ 
+ 	/* LDO0 has minimal voltage 1.2V rather than 1.25V */
+ 	if ((rid == TPS6586X_ID_LDO_0) && (selector == 0))
+ 		return (info->voltages[0] - 50) * 1000;
  
  	return info->voltages[selector] * 1000;
  }