Skip to content

Commit 7425999

Browse files
Alina Yubroonie
authored andcommitted
regulator: rtq2208: Fix LDO to be compatible with both fixed and adjustable vout
In this patch, LDO's adjustable and fixed Vout settings are compatible. The LDO Vout ability depends on "richtek,fixed-microvolt". If adjustable, the Vout can be set to either 1800mV or 3300mV. Signed-off-by: Alina Yu <alina_yu@richtek.com> Link: https://msgid.link/r/5ad4c7728c7fa7f6286db36b99d31c9d0f5d16c7.1716870419.git.alina_yu@richtek.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 72b6a2d commit 7425999

1 file changed

Lines changed: 31 additions & 6 deletions

File tree

drivers/regulator/rtq2208-regulator.c

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ static const struct regulator_ops rtq2208_regulator_buck_ops = {
219219
.set_suspend_mode = rtq2208_set_suspend_mode,
220220
};
221221

222-
static const struct regulator_ops rtq2208_regulator_ldo_ops = {
222+
static const struct regulator_ops rtq2208_regulator_ldo_fix_ops = {
223223
.enable = regulator_enable_regmap,
224224
.disable = regulator_disable_regmap,
225225
.is_enabled = regulator_is_enabled_regmap,
@@ -228,6 +228,23 @@ static const struct regulator_ops rtq2208_regulator_ldo_ops = {
228228
.set_suspend_disable = rtq2208_set_suspend_disable,
229229
};
230230

231+
static const struct regulator_ops rtq2208_regulator_ldo_adj_ops = {
232+
.enable = regulator_enable_regmap,
233+
.disable = regulator_disable_regmap,
234+
.is_enabled = regulator_is_enabled_regmap,
235+
.list_voltage = regulator_list_voltage_table,
236+
.set_voltage_sel = regulator_set_voltage_sel_regmap,
237+
.get_voltage_sel = regulator_get_voltage_sel_regmap,
238+
.set_active_discharge = regulator_set_active_discharge_regmap,
239+
.set_suspend_enable = rtq2208_set_suspend_enable,
240+
.set_suspend_disable = rtq2208_set_suspend_disable,
241+
};
242+
243+
static const unsigned int rtq2208_ldo_volt_table[] = {
244+
1800000,
245+
3300000,
246+
};
247+
231248
static struct of_regulator_match rtq2208_ldo_match[] = {
232249
{.name = "ldo2", },
233250
{.name = "ldo1", },
@@ -331,7 +348,7 @@ static int rtq2208_of_get_ldo_dvs_ability(struct device *dev)
331348
{
332349
struct device_node *np;
333350
struct of_regulator_match *match;
334-
struct rtq2208_regulator_desc *rdesc;
351+
struct regulator_desc *desc;
335352
struct regulator_init_data *init_data;
336353
int ret, i;
337354

@@ -352,13 +369,21 @@ static int rtq2208_of_get_ldo_dvs_ability(struct device *dev)
352369
for (i = 0; i < ARRAY_SIZE(rtq2208_ldo_match); i++) {
353370
match = rtq2208_ldo_match + i;
354371
init_data = match->init_data;
355-
rdesc = (struct rtq2208_regulator_desc *)match->driver_data;
372+
desc = (struct regulator_desc *)match->desc;
356373

357-
if (!init_data || !rdesc)
374+
if (!init_data || !desc)
358375
continue;
359376

360-
if (init_data->constraints.min_uV == init_data->constraints.max_uV)
361-
rdesc->desc.fixed_uV = init_data->constraints.min_uV;
377+
if (init_data->constraints.min_uV == init_data->constraints.max_uV) {
378+
desc->fixed_uV = init_data->constraints.min_uV;
379+
desc->n_voltages = 1;
380+
desc->fixed_uV = init_data->constraints.min_uV;
381+
desc->ops = &rtq2208_regulator_ldo_fix_ops;
382+
} else {
383+
desc->n_voltages = ARRAY_SIZE(rtq2208_ldo_volt_table);
384+
desc->volt_table = rtq2208_ldo_volt_table;
385+
desc->ops = &rtq2208_regulator_ldo_adj_ops;
386+
}
362387
}
363388

364389
return 0;

0 commit comments

Comments
 (0)