Commit bed05181 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v5.19-rc3' of... 

Merge tag 'regulator-fix-v5.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fix from Mark Brown:
 "One fix for an incorrect device description for MP5496"

* tag 'regulator-fix-v5.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: qcom_smd: correct MP5496 ranges
parents 7bc83546 122e951e

drivers/regulator/qcom_smd-regulator.c

+4 −4
Original line number Diff line number Diff line
@@ -723,19 +723,19 @@ static const struct regulator_desc pms405_pldo600 = { 


static const struct regulator_desc mp5496_smpa2 = {

	.linear_ranges = (struct linear_range[]) {

		REGULATOR_LINEAR_RANGE(725000, 0, 27, 12500),

		REGULATOR_LINEAR_RANGE(600000, 0, 127, 12500),

	},

	.n_linear_ranges = 1,

	.n_voltages = 28,

	.n_voltages = 128,

	.ops = &rpm_mp5496_ops,

};



static const struct regulator_desc mp5496_ldoa2 = {

	.linear_ranges = (struct linear_range[]) {

		REGULATOR_LINEAR_RANGE(1800000, 0, 60, 25000),

		REGULATOR_LINEAR_RANGE(800000, 0, 127, 25000),

	},

	.n_linear_ranges = 1,

	.n_voltages = 61,

	.n_voltages = 128,

	.ops = &rpm_mp5496_ops,

};