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>

diff --git a/drivers/regulator/tps65023-regulator.c b/drivers/regulator/tps65023-regulator.c
index 701a5900f83f64b6a645bf8d98ae16b0597ead08..a81abd4871bada15973e315519de8cb4eb6fa7e9 100644 (file)
--- a/drivers/regulator/tps65023-regulator.c
+++ b/drivers/regulator/tps65023-regulator.c
@@ -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))
@@ -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: