tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
regulator: rt5033: Use linear ranges to map all voltage selection
Instead of linear mapping, Use linear range to map all voltage selection.
Signed-off-by: ChiYuan Huang <cy_huang@richtek.com>
Reviewed-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/1625553939-9109-1-git-send-email-u0084500@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
authored by
ChiYuan Huang
and committed by
Mark Brown
6eb891cf
e301df76
+17
-8
+15
-6
drivers/regulator/rt5033-regulator.c
+15
-6
drivers/regulator/rt5033-regulator.c
···
13
13
#include <linux/mfd/rt5033-private.h>
14
14
#include <linux/regulator/of_regulator.h>
15
15
16
+
static const struct linear_range rt5033_buck_ranges[] = {
17
+
REGULATOR_LINEAR_RANGE(1000000, 0, 20, 100000),
18
+
REGULATOR_LINEAR_RANGE(3000000, 21, 31, 0),
19
+
};
20
+
21
+
static const struct linear_range rt5033_ldo_ranges[] = {
22
+
REGULATOR_LINEAR_RANGE(1200000, 0, 18, 100000),
23
+
REGULATOR_LINEAR_RANGE(3000000, 19, 31, 0),
24
+
};
25
+
16
26
static const struct regulator_ops rt5033_safe_ldo_ops = {
17
27
.is_enabled = regulator_is_enabled_regmap,
18
28
.enable = regulator_enable_regmap,
···
34
24
.is_enabled = regulator_is_enabled_regmap,
35
25
.enable = regulator_enable_regmap,
36
26
.disable = regulator_disable_regmap,
37
-
.list_voltage = regulator_list_voltage_linear,
38
-
.map_voltage = regulator_map_voltage_linear,
27
+
.list_voltage = regulator_list_voltage_linear_range,
39
28
.get_voltage_sel = regulator_get_voltage_sel_regmap,
40
29
.set_voltage_sel = regulator_set_voltage_sel_regmap,
41
30
};
···
49
40
.type = REGULATOR_VOLTAGE,
50
41
.owner = THIS_MODULE,
51
42
.n_voltages = RT5033_REGULATOR_BUCK_VOLTAGE_STEP_NUM,
52
-
.min_uV = RT5033_REGULATOR_BUCK_VOLTAGE_MIN,
53
-
.uV_step = RT5033_REGULATOR_BUCK_VOLTAGE_STEP,
43
+
.linear_ranges = rt5033_buck_ranges,
44
+
.n_linear_ranges = ARRAY_SIZE(rt5033_buck_ranges),
54
45
.enable_reg = RT5033_REG_CTRL,
55
46
.enable_mask = RT5033_CTRL_EN_BUCK_MASK,
56
47
.vsel_reg = RT5033_REG_BUCK_CTRL,
···
65
56
.type = REGULATOR_VOLTAGE,
66
57
.owner = THIS_MODULE,
67
58
.n_voltages = RT5033_REGULATOR_LDO_VOLTAGE_STEP_NUM,
68
-
.min_uV = RT5033_REGULATOR_LDO_VOLTAGE_MIN,
69
-
.uV_step = RT5033_REGULATOR_LDO_VOLTAGE_STEP,
59
+
.linear_ranges = rt5033_ldo_ranges,
60
+
.n_linear_ranges = ARRAY_SIZE(rt5033_ldo_ranges),
70
61
.enable_reg = RT5033_REG_CTRL,
71
62
.enable_mask = RT5033_CTRL_EN_LDO_MASK,
72
63
.vsel_reg = RT5033_REG_LDO_CTRL,
+2
-2
include/linux/mfd/rt5033-private.h
+2
-2
include/linux/mfd/rt5033-private.h
···
200
200
#define RT5033_REGULATOR_BUCK_VOLTAGE_MIN 1000000U
201
201
#define RT5033_REGULATOR_BUCK_VOLTAGE_MAX 3000000U
202
202
#define RT5033_REGULATOR_BUCK_VOLTAGE_STEP 100000U
203
-
#define RT5033_REGULATOR_BUCK_VOLTAGE_STEP_NUM 21
203
+
#define RT5033_REGULATOR_BUCK_VOLTAGE_STEP_NUM 32
204
204
205
205
/* RT5033 regulator LDO output voltage uV */
206
206
#define RT5033_REGULATOR_LDO_VOLTAGE_MIN 1200000U
207
207
#define RT5033_REGULATOR_LDO_VOLTAGE_MAX 3000000U
208
208
#define RT5033_REGULATOR_LDO_VOLTAGE_STEP 100000U
209
-
#define RT5033_REGULATOR_LDO_VOLTAGE_STEP_NUM 19
209
+
#define RT5033_REGULATOR_LDO_VOLTAGE_STEP_NUM 32
210
210
211
211
/* RT5033 regulator SAFE LDO output voltage uV */
212
212
#define RT5033_REGULATOR_SAFE_LDO_VOLTAGE 4900000U