From 423196e1ae818ca8d2e8cfdfa0dbc98e05376251 Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Mon, 8 Aug 2011 20:29:32 +0200 Subject: [PATCH] --- yaml --- r: 272407 b: refs/heads/master c: f068ad8cca7532bc42115d61489de00fe57c3909 h: refs/heads/master i: 272405: f666c0b8434dd7722cf9741c3f77c00335ad3a3f 272403: 3145b69873c8c16320fd8a8cd08f07cafc897c5d 272399: 4cb2174f59b30b82da42d99f81deedcfd4bfa390 v: v3 --- [refs] | 2 +- trunk/drivers/regulator/tps65023-regulator.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 179d7236c6d0..941eb46a6a8d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba55a9741da6c85176987c15e24383b858749aa2 +refs/heads/master: f068ad8cca7532bc42115d61489de00fe57c3909 diff --git a/trunk/drivers/regulator/tps65023-regulator.c b/trunk/drivers/regulator/tps65023-regulator.c index a81abd4871ba..b912daae9fa0 100644 --- a/trunk/drivers/regulator/tps65023-regulator.c +++ b/trunk/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)) @@ -482,6 +489,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); + /* Enable setting output voltage by I2C */ tps_65023_clear_bits(tps, TPS65023_REG_CON_CTRL2, TPS65023_REG_CTRL2_CORE_ADJ);