Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 272404
b: refs/heads/master
c: fc999b8
h: refs/heads/master
v: v3
  • Loading branch information
Marcus Folkesson authored and Liam Girdwood committed Aug 8, 2011
1 parent 3145b69 commit f10563c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0fcdb109a50afb8b26709175937ba3de9486770b
refs/heads/master: fc999b83799074832367d3cfd724c341c849a7da
11 changes: 11 additions & 0 deletions trunk/drivers/regulator/tps65023-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,13 @@
#define TPS65023_REG_CTRL_LDO2_EN BIT(2)
#define TPS65023_REG_CTRL_LDO1_EN BIT(1)

/* 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(2)
#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))
Expand Down Expand Up @@ -475,6 +482,10 @@ static int __devinit tps_65023_probe(struct i2c_client *client,

i2c_set_clientdata(client, tps);

/* Enable setting output voltage by I2C */
tps_65023_clear_bits(tps, TPS65023_REG_CON_CTRL2,
TPS65023_REG_CTRL2_CORE_ADJ);

return 0;

fail:
Expand Down

0 comments on commit f10563c

Please sign in to comment.