Unverified Commit 7e37c851 authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Mark Brown
Browse files

regulator: mt6358: split ops for buck and linear range LDO regulators 



The buck and linear range LDO (VSRAM_*) regulators share one set of ops.
This set includes support for get/set mode. However this only makes
sense for buck regulators, not LDOs. The callbacks were not checking
whether the register offset and/or mask for mode setting was valid or
not. This ends up making the kernel report "normal" mode operation for
the LDOs.

Create a new set of ops without the get/set mode callbacks for the
linear range LDO regulators.

Fixes: f67ff1bd ("regulator: mt6358: Add support for MT6358 regulator")
Signed-off-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Link: https://lore.kernel.org/r/20230920085336.136238-1-wenst@chromium.org


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

drivers/regulator/mt6358-regulator.c

+15 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ struct mt6358_regulator_info { 
	.desc = {	\

		.name = #vreg,	\

		.of_match = of_match_ptr(match),	\

		.ops = &mt6358_volt_range_ops,	\

		.ops = &mt6358_buck_ops,	\

		.type = REGULATOR_VOLTAGE,	\

		.id = MT6358_ID_##vreg,		\

		.owner = THIS_MODULE,		\
@@ -139,7 +139,7 @@ struct mt6358_regulator_info { 
	.desc = {	\

		.name = #vreg,	\

		.of_match = of_match_ptr(match),	\

		.ops = &mt6358_volt_range_ops,	\

		.ops = &mt6358_buck_ops,	\

		.type = REGULATOR_VOLTAGE,	\

		.id = MT6366_ID_##vreg,		\

		.owner = THIS_MODULE,		\
@@ -450,7 +450,7 @@ static unsigned int mt6358_regulator_get_mode(struct regulator_dev *rdev) 
	}

}



static const struct regulator_ops mt6358_volt_range_ops = {

static const struct regulator_ops mt6358_buck_ops = {

	.list_voltage = regulator_list_voltage_linear,

	.map_voltage = regulator_map_voltage_linear,

	.set_voltage_sel = regulator_set_voltage_sel_regmap,
@@ -464,6 +464,18 @@ static const struct regulator_ops mt6358_volt_range_ops = { 
	.get_mode = mt6358_regulator_get_mode,

};



static const struct regulator_ops mt6358_volt_range_ops = {

	.list_voltage = regulator_list_voltage_linear,

	.map_voltage = regulator_map_voltage_linear,

	.set_voltage_sel = regulator_set_voltage_sel_regmap,

	.get_voltage_sel = mt6358_get_buck_voltage_sel,

	.set_voltage_time_sel = regulator_set_voltage_time_sel,

	.enable = regulator_enable_regmap,

	.disable = regulator_disable_regmap,

	.is_enabled = regulator_is_enabled_regmap,

	.get_status = mt6358_get_status,

};



static const struct regulator_ops mt6358_volt_table_ops = {

	.list_voltage = regulator_list_voltage_table,

	.map_voltage = regulator_map_voltage_iterate,