Pass the requested load directly to the rpm.

Signed-off-by: Bjorn Andersson <bjorn.anders...@sonymobile.com>
---
 drivers/regulator/qcom_rpm-regulator.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/drivers/regulator/qcom_rpm-regulator.c 
b/drivers/regulator/qcom_rpm-regulator.c
index 8364ff3..bab35c6 100644
--- a/drivers/regulator/qcom_rpm-regulator.c
+++ b/drivers/regulator/qcom_rpm-regulator.c
@@ -388,6 +388,28 @@ static int rpm_reg_is_enabled(struct regulator_dev *rdev)
        return vreg->is_enabled;
 }
 
+static int rpm_reg_set_load(struct regulator_dev *rdev, int load_uA)
+{
+       struct qcom_rpm_reg *vreg = rdev_get_drvdata(rdev);
+       const struct rpm_reg_parts *parts = vreg->parts;
+       const struct request_member *req = &parts->ia;
+       int load_mA = load_uA / 1000;
+       int max_mA = req->mask >> req->shift;
+       int ret;
+
+       if (req->mask == 0)
+               return -EINVAL;
+
+       if (load_mA > max_mA)
+               load_mA = max_mA;
+
+       mutex_lock(&vreg->lock);
+       ret = rpm_reg_write(vreg, req, load_mA);
+       mutex_unlock(&vreg->lock);
+
+       return ret;
+}
+
 static struct regulator_ops uV_ops = {
        .list_voltage = regulator_list_voltage_linear_range,
 
@@ -397,6 +419,8 @@ static struct regulator_ops uV_ops = {
        .enable = rpm_reg_uV_enable,
        .disable = rpm_reg_uV_disable,
        .is_enabled = rpm_reg_is_enabled,
+
+       .set_load = rpm_reg_set_load,
 };
 
 static struct regulator_ops mV_ops = {
@@ -408,6 +432,8 @@ static struct regulator_ops mV_ops = {
        .enable = rpm_reg_mV_enable,
        .disable = rpm_reg_mV_disable,
        .is_enabled = rpm_reg_is_enabled,
+
+       .set_load = rpm_reg_set_load,
 };
 
 static struct regulator_ops switch_ops = {
@@ -700,6 +726,10 @@ static int rpm_reg_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
+       /* Regulators with ia property suppports drms */
+       if (vreg->parts->ia.mask)
+               initdata->constraints.valid_ops_mask |= REGULATOR_CHANGE_DRMS;
+
        key = "bias-pull-down";
        if (of_property_read_bool(pdev->dev.of_node, key)) {
                ret = rpm_reg_set(vreg, &vreg->parts->pd, 1);
-- 
1.8.2.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to