regulator: rt5033: Use linear ranges to map all voltage selection
PATCH v2 1/1 regulator: rt5033: Use linear ranges to map all voltage selection
From: ChiYuan Huang <[email protected]>
Instead of linear mapping, Use linear range to map all voltage selection.
---
Since v2
- recover the volt number back in rt5033-private.h
- Add the n_voltages from v1 back.
Even though commit 6549c46af855 ("regulator: rt5033: Fix n_voltages settings for BUCK and LDO") can fix the linear mapping to the correct min/max voltage
But there're still non-step ranges for the reserved value.
To use the linear range can fix it for mapping all voltage selection.
--- drivers/regulator/rt5033-regulator.c | 21 +++++++++++++++------ include/linux/mfd/rt5033-private.h | 4 ++-- 2 files changed, 17 insertions(+), 8 deletions(-)
drivers/regulator/rt5033-regulator.c +15 -6
@@ -13,6 +13,16 @@#include <linux/mfd/rt5033-private.h> #include <linux/regulator/of_regulator.h> +static const struct linear_range rt5033_buck_ranges[] = { +REGULATOR_LINEAR_RANGE (1000000 ,0 ,20 ,100000 ), +REGULATOR_LINEAR_RANGE (3000000 ,21 ,31 ,0 ), +}; + +static const struct linear_range rt5033_ldo_ranges[] = { +REGULATOR_LINEAR_RANGE (1200000 ,0 ,18 ,100000 ), +REGULATOR_LINEAR_RANGE (3000000 ,19 ,31 ,0 ), +}; +static const struct regulator_ops rt5033_safe_ldo_ops = { .is_enabled = regulator_is_enabled_regmap, .enable = regulator_enable_regmap,
@@ -24,8 +34,7 @@ static const struct regulator_ops rt5033_buck_ops = { .is_enabled = regulator_is_enabled_regmap, .enable = regulator_enable_regmap, .disable = regulator_disable_regmap, - .list_voltage = regulator_list_voltage_linear, - .map_voltage = regulator_map_voltage_linear, + .list_voltage = regulator_list_voltage_linear_range, .get_voltage_sel = regulator_get_voltage_sel_regmap, .set_voltage_sel = regulator_set_voltage_sel_regmap, };
@@ -40,8 +49,8 @@ static const struct regulator_desc rt5033_supported_regulators[] = { .type = REGULATOR_VOLTAGE, .owner = THIS_MODULE, .n_voltages = RT5033_REGULATOR_BUCK_VOLTAGE_STEP_NUM, - .min_uV = RT5033_REGULATOR_BUCK_VOLTAGE_MIN, - .uV_step = RT5033_REGULATOR_BUCK_VOLTAGE_STEP, + .linear_ranges = rt5033_buck_ranges, + .n_linear_ranges = ARRAY_SIZE(rt5033_buck_ranges), .enable_reg = RT5033_REG_CTRL, .enable_mask = RT5033_CTRL_EN_BUCK_MASK, .vsel_reg = RT5033_REG_BUCK_CTRL,
@@ -56,8 +65,8 @@ static const struct regulator_desc rt5033_supported_regulators[] = { .type = REGULATOR_VOLTAGE, .owner = THIS_MODULE, .n_voltages = RT5033_REGULATOR_LDO_VOLTAGE_STEP_NUM, - .min_uV = RT5033_REGULATOR_LDO_VOLTAGE_MIN, - .uV_step = RT5033_REGULATOR_LDO_VOLTAGE_STEP, + .linear_ranges = rt5033_ldo_ranges, + .n_linear_ranges = ARRAY_SIZE(rt5033_ldo_ranges), .enable_reg = RT5033_REG_CTRL, .enable_mask = RT5033_CTRL_EN_LDO_MASK, .vsel_reg = RT5033_REG_LDO_CTRL,
include/linux/mfd/rt5033-private.h +2 -2
@@ -200,13 +200,13 @@ enum rt5033_reg {#define RT5033_REGULATOR_BUCK_VOLTAGE_MIN 1000000U#define RT5033_REGULATOR_BUCK_VOLTAGE_MAX 3000000U#define RT5033_REGULATOR_BUCK_VOLTAGE_STEP 100000U -#define RT5033_REGULATOR_BUCK_VOLTAGE_STEP_NUM 21 +#define RT5033_REGULATOR_BUCK_VOLTAGE_STEP_NUM 32/* RT5033 regulator LDO output voltage uV */ #define RT5033_REGULATOR_LDO_VOLTAGE_MIN 1200000U#define RT5033_REGULATOR_LDO_VOLTAGE_MAX 3000000U#define RT5033_REGULATOR_LDO_VOLTAGE_STEP 100000U -#define RT5033_REGULATOR_LDO_VOLTAGE_STEP_NUM 19 +#define RT5033_REGULATOR_LDO_VOLTAGE_STEP_NUM 32/* RT5033 regulator SAFE LDO output voltage uV */ #define RT5033_REGULATOR_SAFE_LDO_VOLTAGE 4900000U
Signature · 1 line
2.7.4
cy_huang <[email protected]> 於 2021年7月6日 週二 下午2:45寫道:
Quoted 6 lines
From: ChiYuan Huang <[email protected]>
Instead of linear mapping, Use linear range to map all voltage selection.
Signed-off-by ChiYuan Huang <[email protected]>
Quoted 14 lines · cy_huang
From: ChiYuan Huang <[email protected]>
Instead of linear mapping, Use linear range to map all voltage selection.
Signed-off-by ChiYuan Huang <[email protected]>---
Since v2
- recover the volt number back inrt5033-private.h
- Add then_voltagesfrom v1 back.Even though commit
6549c46af855("regulator: rt5033: Fixn_voltagessettings for BUCK and LDO") can fix the linear mapping to the correct min/max voltage
But there're still non-step ranges for the reserved value.
Quoted 5 lines
To use the linear range can fix it for mapping all voltage selection.
--- drivers/regulator/rt5033-regulator.c | 21 +++++++++++++++------include/linux/mfd/rt5033-private.h | 4 ++--
Quoted 1 line
2 files changed, 17 insertions(+), 8 deletions(-)
Signature · 4 lines
Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
Mark Brown
maintainerQuoted 1 line · cy_huang
Instead of linear mapping, Use linear range to map all voltage selection.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next
Thanks!
[1/1] regulator: rt5033: Use linear ranges to map all voltage selection
commit: 6eb891cf73bd2ecc877e9916951a19f3e4f3c493
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark