public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Yadwinder Singh Brar <yadi.brar@samsung.com>
To: linux-kernel@vger.kernel.org
Cc: yadi.brar01@gmail.com, sbkim73@samsung.com, broonie@kernel.org,
	lgirdwood@gmail.com, sameo@linux.intel.com,
	rob.herring@calxeda.com, grant.likely@linaro.org,
	Yadwinder Singh Brar <yadi.brar@samsung.com>
Subject: [PATCH 2/4] regulator: s2mps11: Implement set_voltage_time_sel() ops for bucks
Date: Mon, 24 Jun 2013 16:50:56 +0530	[thread overview]
Message-ID: <1372072858-6559-3-git-send-email-yadi.brar@samsung.com> (raw)
In-Reply-To: <1372072858-6559-1-git-send-email-yadi.brar@samsung.com>

Currently driver uses local struct s2mps11_info to store ramp rate for bucks
whic its getting through platform data, so instead of using regulator
constraints it should use s2mps11_info to calculate ramp delay.

Signed-off-by: Yadwinder Singh Brar <yadi.brar@samsung.com>
---
 drivers/regulator/s2mps11.c |   53 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 52 insertions(+), 1 deletions(-)

diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index 0ec9aea..d42ad2a 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -54,6 +54,57 @@ static int get_ramp_delay(int ramp_delay)
 	return cnt;
 }
 
+static int s2mps11_regulator_set_voltage_time_sel(struct regulator_dev *rdev,
+				   unsigned int old_selector,
+				   unsigned int new_selector)
+{
+	struct s2mps11_info *s2mps11 = rdev_get_drvdata(rdev);
+	unsigned int ramp_delay = 0;
+	int old_volt, new_volt;
+
+	switch (rdev->desc->id) {
+	case S2MPS11_BUCK2:
+		if (!s2mps11->buck2_ramp)
+			return 0;
+		ramp_delay = s2mps11->ramp_delay2;
+		break;
+	case S2MPS11_BUCK3:
+		if (!s2mps11->buck3_ramp)
+			return 0;
+		ramp_delay = s2mps11->ramp_delay34;
+		break;
+	case S2MPS11_BUCK4:
+		if (!s2mps11->buck4_ramp)
+			return 0;
+		ramp_delay = s2mps11->ramp_delay34;
+		break;
+	case S2MPS11_BUCK5:
+		ramp_delay = s2mps11->ramp_delay5;
+		break;
+	case S2MPS11_BUCK6:
+		if (!s2mps11->buck6_ramp)
+			return 0;
+	case S2MPS11_BUCK1:
+		ramp_delay = s2mps11->ramp_delay16;
+		break;
+	case S2MPS11_BUCK7:
+	case S2MPS11_BUCK8:
+	case S2MPS11_BUCK10:
+		ramp_delay = s2mps11->ramp_delay7810;
+		break;
+	case S2MPS11_BUCK9:
+		ramp_delay = s2mps11->ramp_delay9;
+	}
+
+	if (ramp_delay == 0)
+		ramp_delay = rdev->desc->ramp_delay;
+
+	old_volt = rdev->desc->min_uV + (rdev->desc->uV_step * old_selector);
+	new_volt = rdev->desc->min_uV + (rdev->desc->uV_step * new_selector);
+
+	return DIV_ROUND_UP(abs(new_volt - old_volt), ramp_delay);
+}
+
 static struct regulator_ops s2mps11_ldo_ops = {
 	.list_voltage		= regulator_list_voltage_linear,
 	.map_voltage		= regulator_map_voltage_linear,
@@ -73,7 +124,7 @@ static struct regulator_ops s2mps11_buck_ops = {
 	.disable		= regulator_disable_regmap,
 	.get_voltage_sel	= regulator_get_voltage_sel_regmap,
 	.set_voltage_sel	= regulator_set_voltage_sel_regmap,
-	.set_voltage_time_sel	= regulator_set_voltage_time_sel,
+	.set_voltage_time_sel	= s2mps11_regulator_set_voltage_time_sel,
 };
 
 #define regulator_desc_ldo1(num)	{		\
-- 
1.7.0.4


  parent reply	other threads:[~2013-07-03 11:31 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-24 11:20 [PATCH 0/4] Add DT support for s2mps11 Yadwinder Singh Brar
2013-06-24 11:20 ` [PATCH 1/4] regulator: s2mps11: Convert ramp rate to uV/us and set default ramp rate Yadwinder Singh Brar
2013-07-03 17:51   ` Mark Brown
2013-06-24 11:20 ` Yadwinder Singh Brar [this message]
2013-07-03 11:55   ` [PATCH 2/4] regulator: s2mps11: Implement set_voltage_time_sel() ops for bucks Sachin Kamat
2013-07-03 12:31     ` Yadwinder Singh Brar
2013-07-03 17:55   ` Mark Brown
2013-06-24 11:20 ` [PATCH 3/4] mfd: s2mps11: Add device tree support Yadwinder Singh Brar
2013-07-03 11:46   ` Sachin Kamat
2013-07-03 18:05   ` Mark Brown
2013-07-04  5:07     ` Yadwinder Singh Brar
2013-07-04  9:22       ` Mark Brown
2013-07-04 11:43         ` Yadwinder Singh Brar
2013-07-04 14:51           ` Mark Brown
2013-06-24 11:20 ` [PATCH 4/4] regulator: " Yadwinder Singh Brar
2013-07-03 11:53   ` Sachin Kamat
2013-07-03 12:45     ` Yadwinder Singh Brar
2013-07-03 18:00   ` Mark Brown
2013-07-04  5:14     ` Yadwinder Singh Brar
2013-07-04  9:23       ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1372072858-6559-3-git-send-email-yadi.brar@samsung.com \
    --to=yadi.brar@samsung.com \
    --cc=broonie@kernel.org \
    --cc=grant.likely@linaro.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rob.herring@calxeda.com \
    --cc=sameo@linux.intel.com \
    --cc=sbkim73@samsung.com \
    --cc=yadi.brar01@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox