diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-15 17:59:12 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-15 17:59:12 -0700 |
commit | 584aeccc0b717f447505cc738d8c2f292d9d1a66 (patch) | |
tree | d4356481475213ba8d374ede187c27a17b16354a /drivers/regulator/rtq2208-regulator.c | |
parent | 25617a5c4503b20d2edcc75804169960e7c0d88e (diff) | |
parent | ef0b29e744965e8abc14260503a559366219035c (diff) |
Merge tag 'regulator-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator updates from Mark Brown:
"This s a very quiet release for the regulator API, we have a few new
devices (most of which are just ID updates) and one new fairly
specialist core feature for use in interrupt context.
- An API allowing lockless enable/disable for regulators acquired in
exclusive mode, for use in interrupt contexts
- A rewrite of the MedaTek DVFSRC regulator driver which apparently
never worked
- Support for Mediaktek MT6312, Qualcomm QCA6390 and WCN7850, Renesas
RZ/G2L USB VBUS regulator and ST Microelectronics STM32MP13"
* tag 'regulator-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (26 commits)
regulator: dt-bindings: pca9450: Make interrupt optional
regulator: pca9450: Make IRQ optional
dt-bindings: regulator: sprd,sc2731-regulator: convert to YAML
regulator: max77857: Constify struct regmap_config
regulator: da9121: Constify struct regmap_config
dt-bindings: regulator: ti,tps65132: document VIN supply
dt-bindings: mfd: twl: Fix example
regulator: Add Renesas RZ/G2L USB VBUS regulator driver
regulator: core: Add helper for allow HW access to enable/disable regulator
regulator: Add bindings for MediaTek DVFSRC Regulators
regulator: Add refactored mtk-dvfsrc-regulator driver
regulator: Remove mtk-dvfsrc-regulator.c
regulator: userspace-consumer: quiet device deferral
regulator: dt-bindings: mt6315: Document MT6319 PMIC
regulator: add missing MODULE_DESCRIPTION() macro
dt-bindings: regulator: twl-regulator: convert to yaml
regulator: dt-bindings: describe the PMU module of the WCN7850 package
regulator: dt-bindings: describe the PMU module of the QCA6390 package
regulator: dt-bindings: rtq2208: Add specified fixed LDO VOUT property
regulator: rtq2208: Add fixed LDO VOUT property and check that matches the constraints
...
Diffstat (limited to 'drivers/regulator/rtq2208-regulator.c')
-rw-r--r-- | drivers/regulator/rtq2208-regulator.c | 44 |
1 files changed, 38 insertions, 6 deletions
diff --git a/drivers/regulator/rtq2208-regulator.c b/drivers/regulator/rtq2208-regulator.c index c31b6dc3229c..a5c126afc648 100644 --- a/drivers/regulator/rtq2208-regulator.c +++ b/drivers/regulator/rtq2208-regulator.c @@ -219,7 +219,7 @@ static const struct regulator_ops rtq2208_regulator_buck_ops = { .set_suspend_mode = rtq2208_set_suspend_mode, }; -static const struct regulator_ops rtq2208_regulator_ldo_ops = { +static const struct regulator_ops rtq2208_regulator_ldo_fix_ops = { .enable = regulator_enable_regmap, .disable = regulator_disable_regmap, .is_enabled = regulator_is_enabled_regmap, @@ -228,6 +228,23 @@ static const struct regulator_ops rtq2208_regulator_ldo_ops = { .set_suspend_disable = rtq2208_set_suspend_disable, }; +static const struct regulator_ops rtq2208_regulator_ldo_adj_ops = { + .enable = regulator_enable_regmap, + .disable = regulator_disable_regmap, + .is_enabled = regulator_is_enabled_regmap, + .list_voltage = regulator_list_voltage_table, + .set_voltage_sel = regulator_set_voltage_sel_regmap, + .get_voltage_sel = regulator_get_voltage_sel_regmap, + .set_active_discharge = regulator_set_active_discharge_regmap, + .set_suspend_enable = rtq2208_set_suspend_enable, + .set_suspend_disable = rtq2208_set_suspend_disable, +}; + +static const unsigned int rtq2208_ldo_volt_table[] = { + 1800000, + 3300000, +}; + static struct of_regulator_match rtq2208_ldo_match[] = { {.name = "ldo2", }, {.name = "ldo1", }, @@ -331,8 +348,9 @@ static int rtq2208_of_get_ldo_dvs_ability(struct device *dev) { struct device_node *np; struct of_regulator_match *match; - struct rtq2208_regulator_desc *rdesc; + struct regulator_desc *desc; struct regulator_init_data *init_data; + u32 fixed_uV; int ret, i; if (!dev->of_node) @@ -352,13 +370,27 @@ static int rtq2208_of_get_ldo_dvs_ability(struct device *dev) for (i = 0; i < ARRAY_SIZE(rtq2208_ldo_match); i++) { match = rtq2208_ldo_match + i; init_data = match->init_data; - rdesc = (struct rtq2208_regulator_desc *)match->driver_data; + desc = (struct regulator_desc *)match->desc; - if (!init_data || !rdesc) + if (!init_data || !desc) continue; - if (init_data->constraints.min_uV == init_data->constraints.max_uV) - rdesc->desc.fixed_uV = init_data->constraints.min_uV; + /* specify working fixed voltage if the propery exists */ + ret = of_property_read_u32(match->of_node, "richtek,fixed-microvolt", &fixed_uV); + + if (!ret) { + if (fixed_uV != init_data->constraints.min_uV || + fixed_uV != init_data->constraints.max_uV) + return -EINVAL; + desc->n_voltages = 1; + desc->fixed_uV = fixed_uV; + desc->fixed_uV = init_data->constraints.min_uV; + desc->ops = &rtq2208_regulator_ldo_fix_ops; + } else { + desc->n_voltages = ARRAY_SIZE(rtq2208_ldo_volt_table); + desc->volt_table = rtq2208_ldo_volt_table; + desc->ops = &rtq2208_regulator_ldo_adj_ops; + } } return 0; |