mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
Merge remote-tracking branch 'regulator/fix/palmas' into regulator-palmas
Conflicts: drivers/regulator/palmas-regulator.c
This commit is contained in:
commit
4c0c9cabcb
1 changed files with 12 additions and 0 deletions
|
@ -466,6 +466,10 @@ static int palmas_set_mode_smps(struct regulator_dev *dev, unsigned int mode)
|
||||||
if (rail_enable)
|
if (rail_enable)
|
||||||
palmas_smps_write(pmic->palmas,
|
palmas_smps_write(pmic->palmas,
|
||||||
ddata->palmas_regs_info[id].ctrl_addr, reg);
|
ddata->palmas_regs_info[id].ctrl_addr, reg);
|
||||||
|
|
||||||
|
/* Switch the enable value to ensure this is used for enable */
|
||||||
|
pmic->desc[id].enable_val = pmic->current_reg_mode[id];
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1216,6 +1220,14 @@ static int palmas_smps_registration(struct palmas_pmic *pmic,
|
||||||
return ret;
|
return ret;
|
||||||
pmic->current_reg_mode[id] = reg &
|
pmic->current_reg_mode[id] = reg &
|
||||||
PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK;
|
PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK;
|
||||||
|
|
||||||
|
pmic->desc[id].enable_reg =
|
||||||
|
PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,
|
||||||
|
palmas_regs_info[id].ctrl_addr);
|
||||||
|
pmic->desc[id].enable_mask =
|
||||||
|
PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK;
|
||||||
|
/* set_mode overrides this value */
|
||||||
|
pmic->desc[id].enable_val = SMPS_CTRL_MODE_ON;
|
||||||
}
|
}
|
||||||
|
|
||||||
pmic->desc[id].type = REGULATOR_VOLTAGE;
|
pmic->desc[id].type = REGULATOR_VOLTAGE;
|
||||||
|
|
Loading…
Reference in a new issue