Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f1f52f6 authored by Sean Nyekjaer's avatar Sean Nyekjaer Committed by Greg Kroah-Hartman
Browse files

regulator: pfuze100: limit pfuze-support-disable-sw to pfuze{100,200} 



commit 365ec8b61689bd64d6a61e129e0319bf71336407 upstream.

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: default avatarSean Nyekjaer <sean@geanix.com>
Fixes: 6f1cf5257acc ("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: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 03fe4c08

drivers/regulator/pfuze100-regulator.c

+8 −5
Original line number Diff line number Diff line
@@ -755,6 +755,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;
@@ -762,6 +764,7 @@ static int pfuze100_regulator_probe(struct i2c_client *client, 
					desc->enable_time = 500;

				}

			}

		}



		config.dev = &client->dev;

		config.init_data = init_data;