From: Axel Lin <axel.lin@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Mike Rapoport <mike@compulab.co.il>,
Danny Huang <dahuang@nvidia.com>, Liam Girdwood <lrg@ti.com>,
Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: [PATCH 2/4] regulator: Convert tps6586x to get_voltage_sel
Date: Sat, 24 Mar 2012 09:38:30 +0800 [thread overview]
Message-ID: <1332553110.14114.2.camel@phoenix> (raw)
In-Reply-To: <1332553050.14114.1.camel@phoenix>
This also fixes a bug, LDO0 has minimal voltage 1.2V rather than 1.25V.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
drivers/regulator/tps6586x-regulator.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c
index cfc1f16..af3559b 100644
--- a/drivers/regulator/tps6586x-regulator.c
+++ b/drivers/regulator/tps6586x-regulator.c
@@ -129,7 +129,7 @@ static int tps6586x_ldo_set_voltage(struct regulator_dev *rdev,
selector);
}
-static int tps6586x_ldo_get_voltage(struct regulator_dev *rdev)
+static int tps6586x_get_voltage_sel(struct regulator_dev *rdev)
{
struct tps6586x_regulator *ri = rdev_get_drvdata(rdev);
struct device *parent = to_tps6586x_dev(rdev);
@@ -146,7 +146,7 @@ static int tps6586x_ldo_get_voltage(struct regulator_dev *rdev)
if (val >= ri->desc.n_voltages)
BUG();
- return ri->voltages[val] * 1000;
+ return val;
}
static int tps6586x_dvm_set_voltage(struct regulator_dev *rdev,
@@ -198,7 +198,7 @@ static int tps6586x_regulator_is_enabled(struct regulator_dev *rdev)
static struct regulator_ops tps6586x_regulator_ldo_ops = {
.list_voltage = tps6586x_ldo_list_voltage,
- .get_voltage = tps6586x_ldo_get_voltage,
+ .get_voltage_sel = tps6586x_get_voltage_sel,
.set_voltage = tps6586x_ldo_set_voltage,
.is_enabled = tps6586x_regulator_is_enabled,
@@ -208,7 +208,7 @@ static struct regulator_ops tps6586x_regulator_ldo_ops = {
static struct regulator_ops tps6586x_regulator_dvm_ops = {
.list_voltage = tps6586x_ldo_list_voltage,
- .get_voltage = tps6586x_ldo_get_voltage,
+ .get_voltage_sel = tps6586x_get_voltage_sel,
.set_voltage = tps6586x_dvm_set_voltage,
.is_enabled = tps6586x_regulator_is_enabled,
--
1.7.5.4
next prev parent reply other threads:[~2012-03-24 1:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-24 1:37 [PATCH 1/4] regulator: tps6586x: Fix list minimal voltage setting for LDO0 Axel Lin
2012-03-24 1:38 ` Axel Lin [this message]
2012-03-24 1:42 ` [PATCH 3/4] regulator: Convert tps6586x to set_voltage_sel Axel Lin
2012-03-24 1:44 ` [PATCH 4/4] regulator: Merge tps6586x_regulator_ldo_ops and tps6586x_regulator_dvm_ops Axel Lin
2012-03-26 10:56 ` [PATCH 1/4] regulator: tps6586x: Fix list minimal voltage setting for LDO0 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=1332553110.14114.2.camel@phoenix \
--to=axel.lin@gmail.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=dahuang@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lrg@ti.com \
--cc=mike@compulab.co.il \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.