tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge remote-tracking branch 'regulator/fix/palmas' into regulator-linus
+2
-2
+2
-2
drivers/regulator/palmas-regulator.c
+2
-2
drivers/regulator/palmas-regulator.c
···
840
840
break;
841
841
}
842
842
843
-
if ((id == PALMAS_REG_SMPS6) && (id == PALMAS_REG_SMPS8))
843
+
if ((id == PALMAS_REG_SMPS6) || (id == PALMAS_REG_SMPS8))
844
844
ramp_delay_support = true;
845
845
846
846
if (ramp_delay_support) {
···
878
878
pmic->desc[id].vsel_mask = SMPS10_VSEL;
879
879
pmic->desc[id].enable_reg =
880
880
PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,
881
-
PALMAS_SMPS10_STATUS);
881
+
PALMAS_SMPS10_CTRL);
882
882
pmic->desc[id].enable_mask = SMPS10_BOOST_EN;
883
883
pmic->desc[id].min_uV = 3750000;
884
884
pmic->desc[id].uV_step = 1250000;