[PATCH] regulator: rtq6752: Enclose 'enable' gpio control by enable flag

[PATCH] regulator: rtq6752: Enclose 'enable' gpio control by enable flag

[cy_huang]

From: ChiYuan Huang <cy_huang@richtek.com>

Fix 'enable' gpio control logic if it's specified.

Signed-off-by: ChiYuan Huang <cy_huang@richtek.com>
---
This patch is to prevent the logic error from the below cases.

1. All off and both are sequentially controlled to be on.
The 'enable' gpio control block to be called twice including the delay time.

2. Both are on and one is preparing to be off.
The 'enable' gpio control low before register cache is configured to be true.

---
 drivers/regulator/rtq6752-regulator.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/regulator/rtq6752-regulator.c b/drivers/regulator/rtq6752-regulator.c
index 609d3fc..dfe45fb 100644
--- a/drivers/regulator/rtq6752-regulator.c
+++ b/drivers/regulator/rtq6752-regulator.c
@@ -54,14 +54,14 @@ static int rtq6752_set_vdd_enable(struct regulator_dev *rdev)
 	int rid = rdev_get_id(rdev), ret;
 
 	mutex_lock(&priv->lock);
-	if (priv->enable_gpio) {
-		gpiod_set_value(priv->enable_gpio, 1);
+	if (!priv->enable_flag) {
+		if (priv->enable_gpio) {
+			gpiod_set_value(priv->enable_gpio, 1);
 
-		usleep_range(RTQ6752_I2CRDY_TIMEUS,
-			     RTQ6752_I2CRDY_TIMEUS + 100);
-	}
+			usleep_range(RTQ6752_I2CRDY_TIMEUS,
+				     RTQ6752_I2CRDY_TIMEUS + 100);
+		}
 
-	if (!priv->enable_flag) {
 		regcache_cache_only(priv->regmap, false);
 		ret = regcache_sync(priv->regmap);
 		if (ret) {
@@ -91,11 +91,11 @@ static int rtq6752_set_vdd_disable(struct regulator_dev *rdev)
 	if (!priv->enable_flag) {
 		regcache_cache_only(priv->regmap, true);
 		regcache_mark_dirty(priv->regmap);
-	}
 
-	if (priv->enable_gpio)
-		gpiod_set_value(priv->enable_gpio, 0);
+		if (priv->enable_gpio)
+			gpiod_set_value(priv->enable_gpio, 0);
 
+	}
 	mutex_unlock(&priv->lock);
 
 	return 0;
-- 
2.7.4

Re: [PATCH] regulator: rtq6752: Enclose 'enable' gpio control by enable flag

[Mark Brown]

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

On Tue, Sep 14, 2021 at 09:58:32PM +0800, cy_huang wrote:
> From: ChiYuan Huang <cy_huang@richtek.com>
> 
> Fix 'enable' gpio control logic if it's specified.
> 
> Signed-off-by: ChiYuan Huang <cy_huang@richtek.com>
> ---
> This patch is to prevent the logic error from the below cases.
> 
> 1. All off and both are sequentially controlled to be on.
> The 'enable' gpio control block to be called twice including the delay time.
> 
> 2. Both are on and one is preparing to be off.
> The 'enable' gpio control low before register cache is configured to be true.

This should be in the actual commit message.

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

Re: [PATCH] regulator: rtq6752: Enclose 'enable' gpio control by enable flag

[ChiYuan Huang]

Hi,

Mark Brown <broonie@kernel.org> 於 2021年9月14日 週二 下午10:08寫道：
>
> On Tue, Sep 14, 2021 at 09:58:32PM +0800, cy_huang wrote:
> > From: ChiYuan Huang <cy_huang@richtek.com>
> >
> > Fix 'enable' gpio control logic if it's specified.
> >
> > Signed-off-by: ChiYuan Huang <cy_huang@richtek.com>
> > ---
> > This patch is to prevent the logic error from the below cases.
> >
> > 1. All off and both are sequentially controlled to be on.
> > The 'enable' gpio control block to be called twice including the delay time.
> >
> > 2. Both are on and one is preparing to be off.
> > The 'enable' gpio control low before register cache is configured to be true.
>
> This should be in the actual commit message.
OK, I'll send the v2 and add all comments into the commit message.
Thx.