public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Axel Lin <axel.lin@gmail.com>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Sangbeom Kim <sbkim73@samsung.com>, Liam Girdwood <lrg@ti.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH RFT] regulator: s2mps11: Fix ramp_delay settings for s2mps11_buck_ops
Date: Tue, 17 Jul 2012 14:47:21 +0800	[thread overview]
Message-ID: <1342507641.18110.1.camel@phoenix> (raw)

The ramp_delay settings were missing while converting to
regulator_set_voltage_time_sel(). Fix it.

There is no ramp_delay setting for s2mps11_ldo_ops, thus remove
setting set_voltage_sel callback for s2mps11_ldo_ops.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 drivers/regulator/s2mps11.c |   27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index 4669dc9..b0f7ac1 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -62,7 +62,6 @@ static struct regulator_ops s2mps11_ldo_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,
 };
 
 static struct regulator_ops s2mps11_buck_ops = {
@@ -291,6 +290,32 @@ static __devinit int s2mps11_pmic_probe(struct platform_device *pdev)
 	sec_reg_write(iodev, S2MPS11_REG_RAMP_BUCK, ramp_reg);
 
 	for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) {
+		struct regulator_desc *desc = &regulators[i];
+
+		switch (i) {
+		case S2MPS11_BUCK1:
+		case S2MPS11_BUCK6:
+			desc->ramp_delay = pdata->buck16_ramp_delay * 1000;
+			break;
+		case S2MPS11_BUCK2:
+			desc->ramp_delay = pdata->buck2_ramp_delay * 1000;
+			break;
+		case S2MPS11_BUCK3:
+		case S2MPS11_BUCK4:
+			desc->ramp_delay = pdata->buck34_ramp_delay * 1000;
+			break;
+		case S2MPS11_BUCK5:
+			desc->ramp_delay = pdata->buck5_ramp_delay * 1000;
+			break;
+		case S2MPS11_BUCK7:
+		case S2MPS11_BUCK8:
+		case S2MPS11_BUCK10:
+			desc->ramp_delay = pdata->buck7810_ramp_delay * 1000;
+			break;
+		case S2MPS11_BUCK9:
+			desc->ramp_delay = pdata->buck9_ramp_delay * 1000;
+			break;
+		}
 
 		config.dev = &pdev->dev;
 		config.regmap = iodev->regmap;
-- 
1.7.9.5




             reply	other threads:[~2012-07-17  6:47 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-17  6:47 Axel Lin [this message]
2012-08-01 19:58 ` [PATCH RFT] regulator: s2mps11: Fix ramp_delay settings for s2mps11_buck_ops 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=1342507641.18110.1.camel@phoenix \
    --to=axel.lin@gmail.com \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lrg@ti.com \
    --cc=sbkim73@samsung.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