diff options
| author | Marcus Folkesson <marcus.folkesson@gmail.com> | 2011-08-08 20:29:32 +0200 | 
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2011-08-28 17:43:40 +0100 | 
| commit | f068ad8cca7532bc42115d61489de00fe57c3909 (patch) | |
| tree | ed8ccc3db350eded52681950e93cfdba6bb8a354 /drivers/regulator | |
| parent | ba55a9741da6c85176987c15e24383b858749aa2 (diff) | |
| download | linux-f068ad8cca7532bc42115d61489de00fe57c3909.tar.bz2 | |
regulator: tps65023: Fixes i2c configuration issues
Allow i2c core voltage adjustments by clearing CORE ADJ Allowed bit in CTRL2
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/tps65023-regulator.c | 11 | 
1 files changed, 11 insertions, 0 deletions
| diff --git a/drivers/regulator/tps65023-regulator.c b/drivers/regulator/tps65023-regulator.c index a81abd4871ba..b912daae9fa0 100644 --- a/drivers/regulator/tps65023-regulator.c +++ b/drivers/regulator/tps65023-regulator.c @@ -70,6 +70,13 @@  #define TPS65023_REG_CTRL2_DCDC1	BIT(2)  #define TPS65023_REG_CTRL2_DCDC3	BIT(0) +/* REG_CTRL2 bitfields */ +#define TPS65023_REG_CTRL2_GO		BIT(7) +#define TPS65023_REG_CTRL2_CORE_ADJ	BIT(6) +#define TPS65023_REG_CTRL2_DCDC2	BIT(2) +#define TPS65023_REG_CTRL2_DCDC1	BIT(1) +#define TPS65023_REG_CTRL2_DCDC3	BIT(0) +  /* LDO_CTRL bitfields */  #define TPS65023_LDO_CTRL_LDOx_SHIFT(ldo_id)	((ldo_id)*4)  #define TPS65023_LDO_CTRL_LDOx_MASK(ldo_id)	(0xF0 >> ((ldo_id)*4)) @@ -486,6 +493,10 @@ static int __devinit tps_65023_probe(struct i2c_client *client,  	tps_65023_clear_bits(tps, TPS65023_REG_CON_CTRL2,  						TPS65023_REG_CTRL2_CORE_ADJ); +	/* Enable setting output voltage by I2C */ +	tps_65023_clear_bits(tps, TPS65023_REG_CON_CTRL2, +						TPS65023_REG_CTRL2_CORE_ADJ); +  	return 0;   fail: |