Unverified Commit 74259990 authored by Alina Yu's avatar Alina Yu Committed by Mark Brown
Browse files

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: default avatarAlina Yu <alina_yu@richtek.com>
Link: https://msgid.link/r/5ad4c7728c7fa7f6286db36b99d31c9d0f5d16c7.1716870419.git.alina_yu@richtek.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 72b6a2d6

drivers/regulator/rtq2208-regulator.c

+31 −6
Original line number Diff line number Diff line
@@ -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,7 +348,7 @@ 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;

	int ret, i;
@@ -352,13 +369,21 @@ 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;

		if (init_data->constraints.min_uV == init_data->constraints.max_uV) {

			desc->fixed_uV = init_data->constraints.min_uV;

			desc->n_voltages = 1;

			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;