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

regulator: max8973: Don't override control1 variable when set ramp delay bits

Current code overrides control1 variable when setting ramp delay bits.
Fix it by just setting ramp_delay bits.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

authored by

Axel Lin and committed by
Mark Brown b27032ca 60d509fa

+5 -5
+5 -5
drivers/regulator/max8973-regulator.c
··· 274 274 if (pdata->reg_init_data && 275 275 pdata->reg_init_data->constraints.ramp_delay) { 276 276 if (pdata->reg_init_data->constraints.ramp_delay < 25000) 277 - control1 = MAX8973_RAMP_12mV_PER_US; 277 + control1 |= MAX8973_RAMP_12mV_PER_US; 278 278 else if (pdata->reg_init_data->constraints.ramp_delay < 50000) 279 - control1 = MAX8973_RAMP_25mV_PER_US; 279 + control1 |= MAX8973_RAMP_25mV_PER_US; 280 280 else if (pdata->reg_init_data->constraints.ramp_delay < 200000) 281 - control1 = MAX8973_RAMP_50mV_PER_US; 281 + control1 |= MAX8973_RAMP_50mV_PER_US; 282 282 else 283 - control1 = MAX8973_RAMP_200mV_PER_US; 283 + control1 |= MAX8973_RAMP_200mV_PER_US; 284 284 } else { 285 - control1 = MAX8973_RAMP_12mV_PER_US; 285 + control1 |= MAX8973_RAMP_12mV_PER_US; 286 286 max->desc.ramp_delay = 12500; 287 287 } 288 288