diff options
| author |   Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2014-05-26 10:26:46 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@linaro.org> | 2014-05-26 15:39:12 +0100 |
| commit | 112da5cb43427b843e49b8710f53ecdbb3471d9f (patch) | |
| tree | d871184da0d4486d313c0da87ebcb6a65c04e948 /drivers/regulator | |
| parent | Linux 3.15-rc1 (diff) | |
| download | linux-dev-112da5cb43427b843e49b8710f53ecdbb3471d9f.tar.xz linux-dev-112da5cb43427b843e49b8710f53ecdbb3471d9f.zip | |
regulator: s2mpa01: Use correct register for buck1 ramp delay
Fix the register for ramp delay of buck1 regulator. Buck1 and buck6
share the field (offset 4) in ramp delay register S2MPA01_REG_RAMP2.
The driver used the same register and field for ramp delay of buck3 and
buck1. This lead to updating of ramp delay of buck3 when setting buck1
and actually the ramp delay of buck1 was never set.
Fixes: f18792714608 ("regulator: Add support for S2MPA01 regulator")
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Cc: <stable@vger.kernel.org>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/s2mpa01.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/regulator/s2mpa01.c b/drivers/regulator/s2mpa01.c index f19a30f0fb42..a52cb1cec576 100644 --- a/drivers/regulator/s2mpa01.c +++ b/drivers/regulator/s2mpa01.c @@ -116,7 +116,6 @@ static int s2mpa01_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay) ramp_delay = s2mpa01->ramp_delay16; ramp_shift = S2MPA01_BUCK16_RAMP_SHIFT; - ramp_reg = S2MPA01_REG_RAMP1; break; case S2MPA01_BUCK2: enable_shift = S2MPA01_BUCK2_RAMP_EN_SHIFT; |