public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Axel Lin <axel.lin@ingics.com>
To: Mark Brown <broonie@kernel.org>
Cc: Robin Gong <b38343@freescale.com>,
	Liam Girdwood <lgirdwood@gmail.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH] regulator: pfuze100: Simplify pfuze100_set_ramp_delay implementation
Date: Tue, 30 Jul 2013 22:47:44 +0800	[thread overview]
Message-ID: <1375195664.11289.1.camel@phoenix> (raw)

Simplify the equation to calculate ramp_delay.
Below equations are equivalent:
  ramp_delay = 25000 / (2 * ramp_delay);
  ramp_delay = 50000 / (4 * ramp_delay);
  ramp_delay = 25000 / (2 * ramp_delay);
  ramp_delay = 12500 / ramp_delay;
So we don't need to read BIT6 of rdev->desc->vsel_reg for applying different
equations.

Also use rdev->desc->vsel_reg instead of run-time calculate register address.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
 drivers/regulator/pfuze100-regulator.c | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c
index e02d9b9..bda5561 100644
--- a/drivers/regulator/pfuze100-regulator.c
+++ b/drivers/regulator/pfuze100-regulator.c
@@ -93,26 +93,15 @@ static int pfuze100_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)
 {
 	struct pfuze_chip *pfuze100 = rdev_get_drvdata(rdev);
 	int id = rdev->desc->id;
-	unsigned int val, ramp_bits, reg;
+	unsigned int ramp_bits;
 	int ret;
 
 	if (id < PFUZE100_SWBST) {
-		if (id == PFUZE100_SW1AB)
-			reg = PFUZE100_SW1ABVOL;
-		else
-			reg = PFUZE100_SW1CVOL + (id - PFUZE100_SW1C) * 7;
-		regmap_read(pfuze100->regmap, reg, &val);
-
-		if (id <= PFUZE100_SW1C)
-			ramp_delay = 25000 / (2 * ramp_delay);
-		else if (val & 0x40)
-			ramp_delay = 50000 / (4 * ramp_delay);
-		else
-			ramp_delay = 25000 / (2 * ramp_delay);
-
+		ramp_delay = 12500 / ramp_delay;
 		ramp_bits = (ramp_delay >> 1) - (ramp_delay >> 3);
-		ret = regmap_update_bits(pfuze100->regmap, reg + 4 , 0xc0,
-				ramp_bits << 6);
+		ret = regmap_update_bits(pfuze100->regmap,
+					 rdev->desc->vsel_reg + 4,
+					 0xc0, ramp_bits << 6);
 		if (ret < 0)
 			dev_err(pfuze100->dev, "ramp failed, err %d\n", ret);
 	} else
-- 
1.8.1.2




             reply	other threads:[~2013-07-30 14:47 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-30 14:47 Axel Lin [this message]
2013-07-31 15:47 ` [PATCH] regulator: pfuze100: Simplify pfuze100_set_ramp_delay implementation Robin Gong
2013-07-31 16:53 ` 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=1375195664.11289.1.camel@phoenix \
    --to=axel.lin@ingics.com \
    --cc=b38343@freescale.com \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    /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