[PATCH] regualtor: pfuze100: limit pfuze-support-disable-sw to pfuze{100,200}

[PATCH] regualtor: pfuze100: limit pfuze-support-disable-sw to pfuze{100,200}

[Sean Nyekjaer]

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.

Fixes: 6f1cf5257acc ("regualtor: pfuze100: correct sw1a/sw2 on pfuze3000")
Cc: stable@vger.kernel.org
---
 drivers/regulator/pfuze100-regulator.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c
index 7e8ba9246167..01a12cfcea7c 100644
--- a/drivers/regulator/pfuze100-regulator.c
+++ b/drivers/regulator/pfuze100-regulator.c
@@ -836,11 +836,14 @@ 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->regulator_descs[i].sw_reg) {
-				desc->ops = &pfuze100_sw_disable_regulator_ops;
-				desc->enable_val = 0x8;
-				desc->disable_val = 0x0;
-				desc->enable_time = 500;
+			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;
+					desc->disable_val = 0x0;
+					desc->enable_time = 500;
+				}
 			}
 		}
 
-- 
2.28.0

Re: [PATCH] regualtor: pfuze100: limit pfuze-support-disable-sw to pfuze{100,200}

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 675 bytes --]

On Thu, Nov 05, 2020 at 12:49:26PM +0100, Sean Nyekjaer wrote:
> 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.
> 
> Fixes: 6f1cf5257acc ("regualtor: pfuze100: correct sw1a/sw2 on pfuze3000")
> Cc: stable@vger.kernel.org
> ---

You've not provided a Signed-off-by for this so I can't do anything with
it, please see Documentation/process/submitting-patches.rst for details
on what this is and why it's important.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[PATCH v2] regulator: pfuze100: limit pfuze-support-disable-sw to pfuze{100,200}

[Sean Nyekjaer]

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: 6f1cf5257acc ("regualtor: pfuze100: correct sw1a/sw2 on pfuze3000")
Cc: stable@vger.kernel.org
---
Changes since v1:
 - Added signoff
 - fixed typo in commit msg

 drivers/regulator/pfuze100-regulator.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c
index 7e8ba9246167..01a12cfcea7c 100644
--- a/drivers/regulator/pfuze100-regulator.c
+++ b/drivers/regulator/pfuze100-regulator.c
@@ -836,11 +836,14 @@ 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->regulator_descs[i].sw_reg) {
-				desc->ops = &pfuze100_sw_disable_regulator_ops;
-				desc->enable_val = 0x8;
-				desc->disable_val = 0x0;
-				desc->enable_time = 500;
+			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;
+					desc->disable_val = 0x0;
+					desc->enable_time = 500;
+				}
 			}
 		}
 
-- 
2.28.0

Re: [PATCH v2] regulator: pfuze100: limit pfuze-support-disable-sw to pfuze{100,200}

[Mark Brown]

On Tue, 10 Nov 2020 18:41:13 +0100, Sean Nyekjaer wrote:
> 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.

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next

Thanks!

[1/1] regulator: pfuze100: limit pfuze-support-disable-sw to pfuze{100,200}
      commit: 365ec8b61689bd64d6a61e129e0319bf71336407

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

Re: [PATCH] regualtor: pfuze100: limit pfuze-support-disable-sw to pfuze{100,200}

[Mark Brown]

On Thu, 5 Nov 2020 12:49:26 +0100, Sean Nyekjaer wrote:
> 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.

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next

Thanks!

[1/1] regulator: pfuze100: limit pfuze-support-disable-sw to pfuze{100,200}
      commit: 365ec8b61689bd64d6a61e129e0319bf71336407

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark