Unverified Commit 365ec8b6 authored Nov 10, 2020 by Sean Nyekjaer Committed by Mark Brown Nov 11, 2020

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: 6f1cf525 ("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>

parent c088a498

drivers/regulator/pfuze100-regulator.c

+8 −5

Original line number	Diff line number	Diff line
		@@ -836,6 +836,8 @@ static int pfuze100_regulator_probe(struct i2c_client *client,
		* the switched regulator till yet.
		*/
		if (pfuze_chip->flags & PFUZE_FLAG_DISABLE_SW) {
		if (pfuze_chip->chip_id == PFUZE100 \|\|
		pfuze_chip->chip_id == PFUZE200) {
		if (pfuze_chip->regulator_descs[i].sw_reg) {
		desc->ops = &pfuze100_sw_disable_regulator_ops;
		desc->enable_val = 0x8;
		@@ -843,6 +845,7 @@ static int pfuze100_regulator_probe(struct i2c_client *client,
		desc->enable_time = 500;
		}
		}
		}

		config.dev = &client->dev;
		config.init_data = init_data;

Admin message