diff options
| author |   Richard Cochran <rcochran@linutronix.de> | 2017-04-17 10:23:36 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2017-04-18 18:55:05 +0100 |
| commit | c90722b54a4f5e21ac59301ed9a6dbaa439bdb16 (patch) | |
| tree | fbf23f26f9d9f0b4fb1112b66fdc777ab11c6537 /drivers/regulator/tps65023-regulator.c | |
| parent | Merge remote-tracking branches 'regulator/topic/tps65086' and 'regulator/topic/twl' into regulator-next (diff) | |
| download | linux-dev-c90722b54a4f5e21ac59301ed9a6dbaa439bdb16.tar.xz linux-dev-c90722b54a4f5e21ac59301ed9a6dbaa439bdb16.zip | |
regulator: tps65023: Fix inverted core enable logic.
Commit 43530b69d758328d3ffe6ab98fd640463e8e3667 ("regulator: Use
regmap_read/write(), regmap_update_bits functions directly") intended
to replace working inline helper functions with standard regmap
calls. However, it also inverted the set/clear logic of the "CORE ADJ
Allowed" bit. That patch was clearly never tested, since without that
bit cleared, the core VDCDC1 voltage output does not react to I2C
configuration changes.
This patch fixes the issue by clearing the bit as in the original,
correct implementation. Note for stable back porting that, due to
subsequent driver churn, this patch will not apply on every kernel
version.
Fixes: 43530b69d758 ("regulator: Use regmap_read/write(), regmap_update_bits functions directly")
Signed-off-by: Richard Cochran <rcochran@linutronix.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/regulator/tps65023-regulator.c')
| -rw-r--r-- | drivers/regulator/tps65023-regulator.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/regulator/tps65023-regulator.c b/drivers/regulator/tps65023-regulator.c index d2c3d7cc35f5..5ca6d2130593 100644 --- a/drivers/regulator/tps65023-regulator.c +++ b/drivers/regulator/tps65023-regulator.c @@ -311,8 +311,7 @@ static int tps_65023_probe(struct i2c_client *client, /* Enable setting output voltage by I2C */ regmap_update_bits(tps->regmap, TPS65023_REG_CON_CTRL2, - TPS65023_REG_CTRL2_CORE_ADJ, - TPS65023_REG_CTRL2_CORE_ADJ); + TPS65023_REG_CTRL2_CORE_ADJ, 0); return 0; } |