regulator: ab8500-ext: Add HW request support

Support for HW request is added in the external regulator
driver. A flag in the board configuration can be set to
let HW control the regulator when there is no SW request.
This means that the regulator will be put in high power
mode when there is a SW request and in HW-request mode
otherwise.

Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Reviewed-by: Mattias NILSSON <mattias.i.nilsson@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/drivers/regulator/ab8500-ext.c b/drivers/regulator/ab8500-ext.c
index 95008de..21b9bfb 100644 (file)
--- a/drivers/regulator/ab8500-ext.c
+++ b/drivers/regulator/ab8500-ext.c
@@ -28,80 +28,121 @@
  * @dev: device pointer
  * @desc: regulator description
  * @rdev: regulator device
+ * @cfg: regulator configuration (extension of regulator FW configuration)
  * @is_enabled: status of regulator (on/off)
  * @update_bank: bank to control on/off
  * @update_reg: register to control on/off
  * @update_mask: mask to enable/disable and set mode of regulator
  * @update_val: bits holding the regulator current mode
- * @update_val_en: bits to set EN pin active (LPn pin deactive)
+ * @update_val_hp: bits to set EN pin active (LPn pin deactive)
  *                 normally this means high power mode
- * @update_val_en_lp: bits to set EN pin active and LPn pin active
- *                    normally this means low power mode
- * @delay: startup delay in ms
+ * @update_val_lp: bits to set EN pin active and LPn pin active
+ *                 normally this means low power mode
+ * @update_val_hw: bits to set regulator pins in HW control
+ *                 SysClkReq pins and logic will choose mode
  */
 struct ab8500_ext_regulator_info {
        struct device *dev;
        struct regulator_desc desc;
        struct regulator_dev *rdev;
+       struct ab8500_ext_regulator_cfg *cfg;
        bool is_enabled;
        u8 update_bank;
        u8 update_reg;
        u8 update_mask;
        u8 update_val;
-       u8 update_val_en;
-       u8 update_val_en_lp;
+       u8 update_val_hp;
+       u8 update_val_lp;
+       u8 update_val_hw;
 };
 
-static int ab8500_ext_regulator_enable(struct regulator_dev *rdev)
+static int enable(struct ab8500_ext_regulator_info *info, u8 *regval)
 {
        int ret;
-       struct ab8500_ext_regulator_info *info = rdev_get_drvdata(rdev);
 
-       if (info == NULL) {
-               dev_err(rdev_get_dev(rdev), "regulator info null pointer\n");
-               return -EINVAL;
-       }
+       *regval = info->update_val;
+
+       /*
+        * To satisfy both HW high power request and SW request, the regulator
+        * must be on in high power.
+        */
+       if (info->cfg && info->cfg->hwreq)
+               *regval = info->update_val_hp;
 
        ret = abx500_mask_and_set_register_interruptible(info->dev,
                info->update_bank, info->update_reg,
-               info->update_mask, info->update_val);
+               info->update_mask, *regval);
        if (ret < 0)
                dev_err(rdev_get_dev(info->rdev),
                        "couldn't set enable bits for regulator\n");
 
        info->is_enabled = true;
 
-       dev_dbg(rdev_get_dev(rdev), "%s-enable (bank, reg, mask, value):"
-               " 0x%02x, 0x%02x, 0x%02x, 0x%02x\n",
-               info->desc.name, info->update_bank, info->update_reg,
-               info->update_mask, info->update_val);
-
        return ret;
 }
 
-static int ab8500_ext_regulator_disable(struct regulator_dev *rdev)
+static int ab8500_ext_regulator_enable(struct regulator_dev *rdev)
 {
        int ret;
        struct ab8500_ext_regulator_info *info = rdev_get_drvdata(rdev);
+       u8 regval;
 
        if (info == NULL) {
                dev_err(rdev_get_dev(rdev), "regulator info null pointer\n");
                return -EINVAL;
        }
 
+       ret = enable(info, &regval);
+
+       dev_dbg(rdev_get_dev(rdev), "%s-enable (bank, reg, mask, value):"
+               " 0x%02x, 0x%02x, 0x%02x, 0x%02x\n",
+               info->desc.name, info->update_bank, info->update_reg,
+               info->update_mask, regval);
+
+       return ret;
+}
+
+static int disable(struct ab8500_ext_regulator_info *info, u8 *regval)
+{
+       int ret;
+
+       *regval = 0x0;
+
+       /*
+        * Set the regulator in HW request mode if configured
+        */
+       if (info->cfg && info->cfg->hwreq)
+               *regval = info->update_val_hw;
+
        ret = abx500_mask_and_set_register_interruptible(info->dev,
                info->update_bank, info->update_reg,
-               info->update_mask, 0x0);
+               info->update_mask, *regval);
        if (ret < 0)
                dev_err(rdev_get_dev(info->rdev),
                        "couldn't set disable bits for regulator\n");
 
        info->is_enabled = false;
 
+       return ret;
+}
+
+static int ab8500_ext_regulator_disable(struct regulator_dev *rdev)
+{
+       int ret;
+       struct ab8500_ext_regulator_info *info = rdev_get_drvdata(rdev);
+       u8 regval;
+
+       if (info == NULL) {
+               dev_err(rdev_get_dev(rdev), "regulator info null pointer\n");
+               return -EINVAL;
+       }
+
+       ret = disable(info, &regval);
+
        dev_dbg(rdev_get_dev(rdev), "%s-disable (bank, reg, mask, value):"
                " 0x%02x, 0x%02x, 0x%02x, 0x%02x\n",
                info->desc.name, info->update_bank, info->update_reg,
-               info->update_mask, 0x0);
+               info->update_mask, regval);
 
        return ret;
 }
@@ -130,7 +171,8 @@ static int ab8500_ext_regulator_is_enabled(struct regulator_dev *rdev)
                info->desc.name, info->update_bank, info->update_reg,
                info->update_mask, regval);
 
-       if (regval & info->update_mask)
+       if (((regval & info->update_mask) == info->update_val_lp) ||
+           ((regval & info->update_mask) == info->update_val_hp))
                info->is_enabled = true;
        else
                info->is_enabled = false;
@@ -241,7 +283,6 @@ static struct regulator_ops ab8500_ext_regulator_ops = {
        .list_voltage           = ab8500_ext_list_voltage,
 };
 
-
 static struct ab8500_ext_regulator_info
                ab8500_ext_regulator_info[AB8500_NUM_EXT_REGULATORS] = {
        [AB8500_EXT_SUPPLY1] = {
@@ -291,8 +332,9 @@ static struct ab8500_ext_regulator_info
                .update_reg             = 0x08,
                .update_mask            = 0x30,
                .update_val             = 0x10,
-               .update_val_en          = 0x10,
-               .update_val_en_lp       = 0x30,
+               .update_val_hp          = 0x10,
+               .update_val_lp          = 0x30,
+               .update_val_hw          = 0x20,
        },
 };
 
@@ -333,8 +375,8 @@ int ab8500_ext_regulator_init(struct platform_device *pdev)
                /* VextSupply3LPn is inverted on AB8500 2.x */
                info = &ab8500_ext_regulator_info[AB8500_EXT_SUPPLY3];
                info->update_val = 0x30;
-               info->update_val_en = 0x30;
-               info->update_val_en_lp = 0x10;
+               info->update_val_hp = 0x30;
+               info->update_val_lp = 0x10;
        }
 
        /* register all regulators */
@@ -344,6 +386,8 @@ int ab8500_ext_regulator_init(struct platform_device *pdev)
                /* assign per-regulator data */
                info = &ab8500_ext_regulator_info[i];
                info->dev = &pdev->dev;
+               info->cfg = (struct ab8500_ext_regulator_cfg *)
+                       pdata->ext_regulator[i].driver_data;
 
                config.dev = &pdev->dev;
                config.init_data = &pdata->ext_regulator[i];

diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h
index 4e92e5b..cf496e9 100644 (file)
--- a/include/linux/regulator/ab8500.h
+++ b/include/linux/regulator/ab8500.h
@@ -143,6 +143,10 @@ enum ab9540_regulator_reg {
 };
 
 /* AB8500 external regulators */
+struct ab8500_ext_regulator_cfg {
+       bool hwreq; /* requires hw mode or high power mode */
+};
+
 enum ab8500_ext_regulator_id {
        AB8500_EXT_SUPPLY1,
        AB8500_EXT_SUPPLY2,