Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

regulator: arizona-ldo1: Correct default regulator init_data

Both 5102 and 8997 have the regulator capable of supplying 1.8V, and the
voltage step from the 5110 regulator is different from what is specified
in the default description. This patch updates the default regulator
description to match 5110 and selects the 1.8V capable description for
8997.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Cc: stable@vger.kernel.org

authored by

Charles Keepax and committed by
Mark Brown
a35ff286 820cd31e

+3 -4
+3 -4
drivers/regulator/arizona-ldo1.c
··· 153 153 154 154 .vsel_reg = ARIZONA_LDO1_CONTROL_1, 155 155 .vsel_mask = ARIZONA_LDO1_VSEL_MASK, 156 - .bypass_reg = ARIZONA_LDO1_CONTROL_1, 157 - .bypass_mask = ARIZONA_LDO1_BYPASS, 158 156 .min_uV = 900000, 159 - .uV_step = 50000, 160 - .n_voltages = 7, 157 + .uV_step = 25000, 158 + .n_voltages = 13, 161 159 .enable_time = 500, 162 160 163 161 .owner = THIS_MODULE, ··· 199 201 */ 200 202 switch (arizona->type) { 201 203 case WM5102: 204 + case WM8997: 202 205 desc = &arizona_ldo1_hc; 203 206 ldo1->init_data = arizona_ldo1_dvfs; 204 207 break;