diff options
| author | Axel Lin <axel.lin@ingics.com> | 2019-02-04 15:10:51 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-02-06 15:56:17 +0000 |
| commit | 4f297062b288e9434280dd3a2f0ba7424d7a7224 (patch) | |
| tree | b90df752e5340614d10c913f77319c050c69f4df /drivers/regulator | |
| parent | 46689b1e381a09e5907ffd3ddced733379c72ad5 (diff) | |
regulator: rk808: Convert rk805 buck1/2 to use linear range
It looks like linear range is suitable to describe the voltage table
for rk805 buck1/2:
selector 0 ~ 59: 0.7125V with uV_step = 12500
selector 60 ~ 62: 1.8V with uV_step = 200000
selector 63: 2.3V
With this change, then rk805 buck1/2 can reuse rk808_reg_ops_ranges.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Tested-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/rk808-regulator.c | 55 |
1 files changed, 12 insertions, 43 deletions
diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c index 79e79cdd503b..23713e16c286 100644 --- a/drivers/regulator/rk808-regulator.c +++ b/drivers/regulator/rk808-regulator.c @@ -289,21 +289,6 @@ static int rk808_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay) RK808_RAMP_RATE_MASK, ramp_value); } -static int rk805_set_suspend_voltage(struct regulator_dev *rdev, int uv) -{ - unsigned int reg; - int sel = regulator_map_voltage_ascend(rdev, uv, uv); - - if (sel < 0) - return -EINVAL; - - reg = rdev->desc->vsel_reg + RK808_SLP_REG_OFFSET; - - return regmap_update_bits(rdev->regmap, reg, - rdev->desc->vsel_mask, - sel); -} - static int rk808_set_suspend_voltage(struct regulator_dev *rdev, int uv) { unsigned int reg; @@ -399,19 +384,6 @@ static const struct regulator_ops rk805_switch_ops = { .set_suspend_disable = rk805_set_suspend_disable, }; -static struct regulator_ops rk805_buck1_2_ops = { - .list_voltage = regulator_list_voltage_table, - .map_voltage = regulator_map_voltage_ascend, - .get_voltage_sel = regulator_get_voltage_sel_regmap, - .set_voltage_sel = regulator_set_voltage_sel_regmap, - .enable = regulator_enable_regmap, - .disable = regulator_disable_regmap, - .is_enabled = regulator_is_enabled_regmap, - .set_suspend_voltage = rk805_set_suspend_voltage, - .set_suspend_enable = rk805_set_suspend_enable, - .set_suspend_disable = rk805_set_suspend_disable, -}; - static const struct regulator_ops rk808_buck1_2_ops = { .list_voltage = regulator_list_voltage_linear, .map_voltage = regulator_map_voltage_linear, @@ -461,15 +433,10 @@ static const struct regulator_ops rk808_switch_ops = { .set_suspend_disable = rk808_set_suspend_disable, }; -static const int rk805_buck_1_2_voltages[] = { - 712500, 725000, 737500, 750000, 762500, 775000, 787500, 800000, - 812500, 825000, 837500, 850000, 862500, 875000, 887500, 900000, - 912500, 925000, 937500, 950000, 962500, 975000, 987500, 1000000, - 1012500, 1025000, 1037500, 1050000, 1062500, 1075000, 1087500, 1100000, - 1112500, 1125000, 1137500, 1150000, 1162500, 1175000, 1187500, 1200000, - 1212500, 1225000, 1237500, 1250000, 1262500, 1275000, 1287500, 1300000, - 1312500, 1325000, 1337500, 1350000, 1362500, 1375000, 1387500, 1400000, - 1412500, 1425000, 1437500, 1450000, 1800000, 2000000, 2200000, 2300000, +static const struct regulator_linear_range rk805_buck_1_2_voltage_ranges[] = { + REGULATOR_LINEAR_RANGE(712500, 0, 59, 12500), + REGULATOR_LINEAR_RANGE(1800000, 60, 62, 200000), + REGULATOR_LINEAR_RANGE(2300000, 63, 63, 0), }; static const struct regulator_desc rk805_reg[] = { @@ -479,10 +446,11 @@ static const struct regulator_desc rk805_reg[] = { .of_match = of_match_ptr("DCDC_REG1"), .regulators_node = of_match_ptr("regulators"), .id = RK805_ID_DCDC1, - .ops = &rk805_buck1_2_ops, + .ops = &rk808_reg_ops_ranges, .type = REGULATOR_VOLTAGE, - .n_voltages = ARRAY_SIZE(rk805_buck_1_2_voltages), - .volt_table = rk805_buck_1_2_voltages, + .n_voltages = 64, + .linear_ranges = rk805_buck_1_2_voltage_ranges, + .n_linear_ranges = ARRAY_SIZE(rk805_buck_1_2_voltage_ranges), .vsel_reg = RK805_BUCK1_ON_VSEL_REG, .vsel_mask = RK818_BUCK_VSEL_MASK, .enable_reg = RK805_DCDC_EN_REG, @@ -494,10 +462,11 @@ static const struct regulator_desc rk805_reg[] = { .of_match = of_match_ptr("DCDC_REG2"), .regulators_node = of_match_ptr("regulators"), .id = RK805_ID_DCDC2, - .ops = &rk805_buck1_2_ops, + .ops = &rk808_reg_ops_ranges, .type = REGULATOR_VOLTAGE, - .n_voltages = ARRAY_SIZE(rk805_buck_1_2_voltages), - .volt_table = rk805_buck_1_2_voltages, + .n_voltages = 64, + .linear_ranges = rk805_buck_1_2_voltage_ranges, + .n_linear_ranges = ARRAY_SIZE(rk805_buck_1_2_voltage_ranges), .vsel_reg = RK805_BUCK2_ON_VSEL_REG, .vsel_mask = RK818_BUCK_VSEL_MASK, .enable_reg = RK805_DCDC_EN_REG, |