From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 2 Jul 2012 17:24:59 +0000 (+0100)
Subject: Merge tag 'v3.5-rc5' into regulator-drivers
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=744c62eb65a1c3bb2196ded1a1d2922cf6f2ce80;p=deliverable%2Flinux.git

Merge tag 'v3.5-rc5' into regulator-drivers

Linux 3.5-rc5 collides with further development.

Conflicts:
	drivers/regulator/tps65023-regulator.c
---

744c62eb65a1c3bb2196ded1a1d2922cf6f2ce80
diff --cc drivers/regulator/palmas-regulator.c
index 6c485116dd2a,795f75a6ac33..7540c95321ce
--- a/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@@ -667,14 -673,10 +667,16 @@@ static __devinit int palmas_probe(struc
  			pmic->desc[id].ops = &palmas_ops_smps10;
  			pmic->desc[id].vsel_reg = PALMAS_SMPS10_CTRL;
  			pmic->desc[id].vsel_mask = SMPS10_VSEL;
- 			pmic->desc[id].enable_reg = PALMAS_SMPS10_STATUS;
+ 			pmic->desc[id].enable_reg =
+ 					PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,
+ 							PALMAS_SMPS10_STATUS);
  			pmic->desc[id].enable_mask = SMPS10_BOOST_EN;
 +			pmic->desc[id].min_uV = 3750000;
 +			pmic->desc[id].uV_step = 1250000;
 +			break;
 +		default:
 +			pmic->desc[id].ops = &palmas_ops_smps;
 +			pmic->desc[id].n_voltages = PALMAS_SMPS_NUM_VOLTAGES;
  		}
  
  		pmic->desc[id].type = REGULATOR_VOLTAGE;