Commit dcbd8eec authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'regulator/fix/palmas' into regulator-linus

parents 2a66a854 f232168d
...@@ -840,7 +840,7 @@ static int palmas_regulators_probe(struct platform_device *pdev) ...@@ -840,7 +840,7 @@ static int palmas_regulators_probe(struct platform_device *pdev)
break; break;
} }
if ((id == PALMAS_REG_SMPS6) && (id == PALMAS_REG_SMPS8)) if ((id == PALMAS_REG_SMPS6) || (id == PALMAS_REG_SMPS8))
ramp_delay_support = true; ramp_delay_support = true;
if (ramp_delay_support) { if (ramp_delay_support) {
...@@ -878,7 +878,7 @@ static int palmas_regulators_probe(struct platform_device *pdev) ...@@ -878,7 +878,7 @@ static int palmas_regulators_probe(struct platform_device *pdev)
pmic->desc[id].vsel_mask = SMPS10_VSEL; pmic->desc[id].vsel_mask = SMPS10_VSEL;
pmic->desc[id].enable_reg = pmic->desc[id].enable_reg =
PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE, PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,
PALMAS_SMPS10_STATUS); PALMAS_SMPS10_CTRL);
pmic->desc[id].enable_mask = SMPS10_BOOST_EN; pmic->desc[id].enable_mask = SMPS10_BOOST_EN;
pmic->desc[id].min_uV = 3750000; pmic->desc[id].min_uV = 3750000;
pmic->desc[id].uV_step = 1250000; pmic->desc[id].uV_step = 1250000;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment