regulator: rtq6752: fix reg reset behavior
authorChiYuan Huang <cy_huang@richtek.com>
Fri, 16 Jul 2021 03:55:46 +0000 (11:55 +0800)
committerMark Brown <broonie@kernel.org>
Fri, 16 Jul 2021 12:55:34 +0000 (13:55 +0100)
Reg will be reset in below two conditions.
1. 'Enable' pin from H to L.
2. Both PAVDD and NAVDD are all disabled.

And 'Enable' pin also control i2c communication capability.

This patch is to Seperate the if condition in enable/disable callback for
reg cache manipulation.

Signed-off-by: ChiYuan Huang <cy_huang@richtek.com>
Link: https://lore.kernel.org/r/1626407746-23156-1-git-send-email-u0084500@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/regulator/rtq6752-regulator.c

index 72a72aa50d81f2fbad2da62c9d11b4b47aafe633..609d3fcf4923d2a8df3ac8268ed6d49d34dad75b 100644 (file)
@@ -54,12 +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_flag && priv->enable_gpio) {
+       if (priv->enable_gpio) {
                gpiod_set_value(priv->enable_gpio, 1);
 
                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) {
@@ -86,12 +88,14 @@ static int rtq6752_set_vdd_disable(struct regulator_dev *rdev)
        mutex_lock(&priv->lock);
        priv->enable_flag &= ~BIT(rid);
 
-       if (!priv->enable_flag && priv->enable_gpio) {
+       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);
-       }
+
        mutex_unlock(&priv->lock);
 
        return 0;