diff options
| author | Axel Lin <axel.lin@ingics.com> | 2012-11-29 09:59:16 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-06 15:20:52 +0900 |
| commit | ad02e846878ca35e9d3fa584be8ee770e9e14fce (patch) | |
| tree | 03a914da8f56bc17a7dd34c2a4a7c3375421c92d /drivers/regulator | |
| parent | 9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff) | |
regulator: palmas: Return raw register values as the selectors in [get|set]_voltage_sel
Don't adjust the selector in [get|set]_voltage_sel, fix it in list_voltage() instead.
For smps*(except smps10), the vsel reg-value and voltage mapping as below:
reg-value volt (uV) ( Assume RANGE is x1 )
0 0
1 500000
2 500000
3 500000
4 500000
5 500000
6 500000 (0.49V + 1 * 0.01V) * RANGE
7 510000 (0.49V + 2 * 0.01V) * RANGE
8 520000 (0.49V + 3 * 0.01V) * RANGE
9 530000 (0.49V + 4 * 0.01V) * RANGE
....
The linear mapping is start from selector 6.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/palmas-regulator.c | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c index 07aee694ba92..151c0c46ac01 100644 --- a/drivers/regulator/palmas-regulator.c +++ b/drivers/regulator/palmas-regulator.c @@ -309,19 +309,22 @@ static int palmas_list_voltage_smps(struct regulator_dev *dev, int id = rdev_get_id(dev); int mult = 1; - if (!selector) - return 0; - /* Read the multiplier set in VSEL register to return * the correct voltage. */ if (pmic->range[id]) mult = 2; - /* Voltage is (0.49V + (selector * 0.01V)) * RANGE - * as defined in data sheet. RANGE is either x1 or x2 - */ - return (490000 + (selector * 10000)) * mult; + if (selector == 0) + return 0; + else if (selector < 6) + return 500000 * mult; + else + /* Voltage is linear mapping starting from selector 6, + * volt = (0.49V + ((selector - 5) * 0.01V)) * RANGE + * RANGE is either x1 or x2 + */ + return (490000 + ((selector - 5) * 10000)) * mult; } static int palmas_get_voltage_smps_sel(struct regulator_dev *dev) @@ -338,15 +341,6 @@ static int palmas_get_voltage_smps_sel(struct regulator_dev *dev) selector = reg & PALMAS_SMPS12_VOLTAGE_VSEL_MASK; - /* Adjust selector to match list_voltage ranges */ - if ((selector > 0) && (selector < 6)) - selector = 6; - if (!selector) - selector = 5; - if (selector > 121) - selector = 121; - selector -= 5; - return selector; } @@ -355,19 +349,15 @@ static int palmas_set_voltage_smps_sel(struct regulator_dev *dev, { struct palmas_pmic *pmic = rdev_get_drvdata(dev); int id = rdev_get_id(dev); - unsigned int reg = 0; - unsigned int addr; + unsigned int reg, addr; addr = palmas_regs_info[id].vsel_addr; + reg = selector; /* Make sure we don't change the value of RANGE */ if (pmic->range[id]) reg |= PALMAS_SMPS12_VOLTAGE_RANGE; - /* Adjust the linux selector into range used in VSEL register */ - if (selector) - reg |= selector + 5; - palmas_smps_write(pmic->palmas, addr, reg); return 0; @@ -386,11 +376,11 @@ static int palmas_map_voltage_smps(struct regulator_dev *rdev, if (pmic->range[id]) { /* RANGE is x2 */ if (min_uV < 1000000) min_uV = 1000000; - ret = DIV_ROUND_UP(min_uV - 1000000, 20000) + 1; + ret = DIV_ROUND_UP(min_uV - 1000000, 20000) + 6; } else { /* RANGE is x1 */ if (min_uV < 500000) min_uV = 500000; - ret = DIV_ROUND_UP(min_uV - 500000, 10000) + 1; + ret = DIV_ROUND_UP(min_uV - 500000, 10000) + 6; } /* Map back into a voltage to verify we're still in bounds */ |