diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-30 06:58:40 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-30 06:58:40 -0400 |
| commit | dcbd8eec68500beed75cf41630b89da6c85ad1e4 (patch) | |
| tree | 508bbb141ce7151c1c65c3d2198603214fbb3090 /drivers/regulator | |
| parent | 2a66a854f5d716bb67e24dba78e53bdd5f0253ad (diff) | |
| parent | f232168df0c7e7414b70ac5d8fed83086d441c0b (diff) | |
Merge remote-tracking branch 'regulator/fix/palmas' into regulator-linus
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/palmas-regulator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c index 92ceed0fc65e..3ae44ac12a94 100644 --- a/drivers/regulator/palmas-regulator.c +++ b/drivers/regulator/palmas-regulator.c | |||
| @@ -840,7 +840,7 @@ static int palmas_regulators_probe(struct platform_device *pdev) | |||
| 840 | break; | 840 | break; |
| 841 | } | 841 | } |
| 842 | 842 | ||
| 843 | if ((id == PALMAS_REG_SMPS6) && (id == PALMAS_REG_SMPS8)) | 843 | if ((id == PALMAS_REG_SMPS6) || (id == PALMAS_REG_SMPS8)) |
| 844 | ramp_delay_support = true; | 844 | ramp_delay_support = true; |
| 845 | 845 | ||
| 846 | if (ramp_delay_support) { | 846 | if (ramp_delay_support) { |
| @@ -878,7 +878,7 @@ static int palmas_regulators_probe(struct platform_device *pdev) | |||
| 878 | pmic->desc[id].vsel_mask = SMPS10_VSEL; | 878 | pmic->desc[id].vsel_mask = SMPS10_VSEL; |
| 879 | pmic->desc[id].enable_reg = | 879 | pmic->desc[id].enable_reg = |
| 880 | PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE, | 880 | PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE, |
| 881 | PALMAS_SMPS10_STATUS); | 881 | PALMAS_SMPS10_CTRL); |
| 882 | pmic->desc[id].enable_mask = SMPS10_BOOST_EN; | 882 | pmic->desc[id].enable_mask = SMPS10_BOOST_EN; |
| 883 | pmic->desc[id].min_uV = 3750000; | 883 | pmic->desc[id].min_uV = 3750000; |
| 884 | pmic->desc[id].uV_step = 1250000; | 884 | pmic->desc[id].uV_step = 1250000; |