History

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

Linus Torvalds committed 4 years ago

Commit bed05182 parents 7bc8354 122e9511 file · +4 −4Browse files

Unified · Split

drivers/regulator/qcom_smd-regulator.c+4−4
@@ -723,19 +723,19 @@ static const struct regulator_desc pms405_pldo600 = { · 722 unmodified lines
723 723
724static const struct regulator_desc mp5496_smpa2 = {724static const struct regulator_desc mp5496_smpa2 = {
725 .linear_ranges = (struct linear_range[]) {725 .linear_ranges = (struct linear_range[]) {
726 REGULATOR_LINEAR_RANGE(725000, 0, 27, 12500),726 REGULATOR_LINEAR_RANGE(600000, 0, 127, 12500),
727 },727 },
728 .n_linear_ranges = 1,728 .n_linear_ranges = 1,
729 .n_voltages = 28,729 .n_voltages = 128,
730 .ops = &rpm_mp5496_ops,730 .ops = &rpm_mp5496_ops,
731};731};
732 732
733static const struct regulator_desc mp5496_ldoa2 = {733static const struct regulator_desc mp5496_ldoa2 = {
734 .linear_ranges = (struct linear_range[]) {734 .linear_ranges = (struct linear_range[]) {
735 REGULATOR_LINEAR_RANGE(1800000, 0, 60, 25000),735 REGULATOR_LINEAR_RANGE(800000, 0, 127, 25000),
736 },736 },
737 .n_linear_ranges = 1,737 .n_linear_ranges = 1,
738 .n_voltages = 61,738 .n_voltages = 128,
739 .ops = &rpm_mp5496_ops,739 .ops = &rpm_mp5496_ops,
740};740};
741 741