diff options
author | ChiYuan Huang <cy_huang@richtek.com> | 2021-07-16 11:55:46 +0800 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2021-07-16 13:55:34 +0100 |
commit | 513d14045a2dad0bf202b7d4c07a2ca2afdba0b4 (patch) | |
tree | 337b631ad28e11a86985c0163473eb89e7049037 /drivers/regulator | |
parent | 541ee8f640327f951e7039278057827322231ab0 (diff) | |
download | linux-513d14045a2dad0bf202b7d4c07a2ca2afdba0b4.tar.bz2 |
regulator: rtq6752: fix reg reset behavior
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>
Diffstat (limited to 'drivers/regulator')
-rw-r--r-- | drivers/regulator/rtq6752-regulator.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/regulator/rtq6752-regulator.c b/drivers/regulator/rtq6752-regulator.c index 72a72aa50d81..609d3fcf4923 100644 --- a/drivers/regulator/rtq6752-regulator.c +++ b/drivers/regulator/rtq6752-regulator.c @@ -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; |