regulator: helpers: Modify helpers enabling multi-bit control

This patch extends the regulator helpers to account for device that use
multiple bits for control when using regmap enable/disable/bypass ops.

The actual regulator helpers wrongly assume that the regulator control
is always performed using single bits, using in the regulator_desc
struct only two parameters *_reg and *_mask defining register and mask
for control.

This patch extends this struct and introduces the helpers to take into
account devices where control is performed using multiple bits and
specific multi-bit values are used for enabling/disabling/bypassing the
regulator.

Signed-off-by: Carlo Caione <carlo@caione.org>
Signed-off-by: Mark Brown <broonie@linaro.org>

1 files changed, 32 insertions, 16 deletions

diff --git a/drivers/regulator/helpers.c b/drivers/regulator/helpers.c
index e221a271ba56..cbc39096c78d 100644
--- a/drivers/regulator/helpers.c
+++ b/drivers/regulator/helpers.c
@@ -37,10 +37,17 @@ int regulator_is_enabled_regmap(struct regulator_dev *rdev)
         if (ret != 0)
                 return ret;
 
-        if (rdev->desc->enable_is_inverted)
-                return (val & rdev->desc->enable_mask) == 0;
-        else
-                return (val & rdev->desc->enable_mask) != 0;
+        val &= rdev->desc->enable_mask;
+
+        if (rdev->desc->enable_is_inverted) {
+                if (rdev->desc->enable_val)
+                        return val != rdev->desc->enable_val;
+                return val == 0;
+        } else {
+                if (rdev->desc->enable_val)
+                        return val == rdev->desc->enable_val;
+                return val != 0;
+        }
 }
 EXPORT_SYMBOL_GPL(regulator_is_enabled_regmap);
 
@@ -57,10 +64,13 @@ int regulator_enable_regmap(struct regulator_dev *rdev)
 {
         unsigned int val;
 
-        if (rdev->desc->enable_is_inverted)
-                val = 0;
-        else
-                val = rdev->desc->enable_mask;
+        if (rdev->desc->enable_is_inverted) {
+                val = rdev->desc->disable_val;
+        } else {
+                val = rdev->desc->enable_val;
+                if (!val)
+                        val = rdev->desc->enable_mask;
+        }
 
         return regmap_update_bits(rdev->regmap, rdev->desc->enable_reg,
                                   rdev->desc->enable_mask, val);
@@ -80,10 +90,13 @@ int regulator_disable_regmap(struct regulator_dev *rdev)
 {
         unsigned int val;
 
-        if (rdev->desc->enable_is_inverted)
-                val = rdev->desc->enable_mask;
-        else
-                val = 0;
+        if (rdev->desc->enable_is_inverted) {
+                val = rdev->desc->enable_val;
+                if (!val)
+                        val = rdev->desc->enable_mask;
+        } else {
+                val = rdev->desc->disable_val;
+        }
 
         return regmap_update_bits(rdev->regmap, rdev->desc->enable_reg,
                                   rdev->desc->enable_mask, val);
@@ -419,10 +432,13 @@ int regulator_set_bypass_regmap(struct regulator_dev *rdev, bool enable)
 {
         unsigned int val;
 
-        if (enable)
-                val = rdev->desc->bypass_mask;
-        else
-                val = 0;
+        if (enable) {
+                val = rdev->desc->bypass_val_on;
+                if (!val)
+                        val = rdev->desc->bypass_mask;
+        } else {
+                val = rdev->desc->bypass_val_off;
+        }
 
         return regmap_update_bits(rdev->regmap, rdev->desc->bypass_reg,
                                   rdev->desc->bypass_mask, val);