Skip to content

Commit 365ec8b

Browse files
sknseanbroonie
authored andcommitted
regulator: pfuze100: limit pfuze-support-disable-sw to pfuze{100,200}
Limit the fsl,pfuze-support-disable-sw to the pfuze100 and pfuze200 variants. When enabling fsl,pfuze-support-disable-sw and using a pfuze3000 or pfuze3001, the driver would choose pfuze100_sw_disable_regulator_ops instead of the newly introduced and correct pfuze3000_sw_regulator_ops. Signed-off-by: Sean Nyekjaer <sean@geanix.com> Fixes: 6f1cf52 ("regualtor: pfuze100: correct sw1a/sw2 on pfuze3000") Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20201110174113.2066534-1-sean@geanix.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent c088a49 commit 365ec8b

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

drivers/regulator/pfuze100-regulator.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -836,11 +836,14 @@ static int pfuze100_regulator_probe(struct i2c_client *client,
836836
* the switched regulator till yet.
837837
*/
838838
if (pfuze_chip->flags & PFUZE_FLAG_DISABLE_SW) {
839-
if (pfuze_chip->regulator_descs[i].sw_reg) {
840-
desc->ops = &pfuze100_sw_disable_regulator_ops;
841-
desc->enable_val = 0x8;
842-
desc->disable_val = 0x0;
843-
desc->enable_time = 500;
839+
if (pfuze_chip->chip_id == PFUZE100 ||
840+
pfuze_chip->chip_id == PFUZE200) {
841+
if (pfuze_chip->regulator_descs[i].sw_reg) {
842+
desc->ops = &pfuze100_sw_disable_regulator_ops;
843+
desc->enable_val = 0x8;
844+
desc->disable_val = 0x0;
845+
desc->enable_time = 500;
846+
}
844847
}
845848
}
846849

0 commit comments

Comments
 (0)