The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: "Heiko Stübner" <heiko@sntech.de>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Liam Girdwood <lrg@ti.com>, LKML <linux-kernel@vger.kernel.org>,
	Axel Lin <axel.lin@gmail.com>
Subject: [PATCH 3/3] regulator: gpio-regulator: populate selector from set_voltage
Date: Sun, 3 Jun 2012 21:32:05 +0200	[thread overview]
Message-ID: <201206032132.06209.heiko@sntech.de> (raw)
In-Reply-To: <201206032129.45414.heiko@sntech.de>

This was missing until now and the underlying
_regulator_do_set_voltage is using this value when calling list_voltage.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 drivers/regulator/gpio-regulator.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
index 2c38bea..242851a 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -101,7 +101,7 @@ static int gpio_regulator_get_value(struct regulator_dev *dev)
 }
 
 static int gpio_regulator_set_value(struct regulator_dev *dev,
-					int min, int max)
+					int min, int max, unsigned *selector)
 {
 	struct gpio_regulator_data *data = rdev_get_drvdata(dev);
 	int ptr, target = 0, state, best_val = INT_MAX;
@@ -112,6 +112,8 @@ static int gpio_regulator_set_value(struct regulator_dev *dev,
 		    data->states[ptr].value <= max) {
 			target = data->states[ptr].gpios;
 			best_val = data->states[ptr].value;
+			if (selector)
+				*selector = ptr;
 		}
 
 	if (best_val == INT_MAX)
@@ -130,7 +132,7 @@ static int gpio_regulator_set_voltage(struct regulator_dev *dev,
 					int min_uV, int max_uV,
 					unsigned *selector)
 {
-	return gpio_regulator_set_value(dev, min_uV, max_uV);
+	return gpio_regulator_set_value(dev, min_uV, max_uV, selector);
 }
 
 static int gpio_regulator_list_voltage(struct regulator_dev *dev,
@@ -147,7 +149,7 @@ static int gpio_regulator_list_voltage(struct regulator_dev *dev,
 static int gpio_regulator_set_current_limit(struct regulator_dev *dev,
 					int min_uA, int max_uA)
 {
-	return gpio_regulator_set_value(dev, min_uA, max_uA);
+	return gpio_regulator_set_value(dev, min_uA, max_uA, NULL);
 }
 
 static struct regulator_ops gpio_regulator_voltage_ops = {
-- 
1.7.2.3


  parent reply	other threads:[~2012-06-03 19:32 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-03 19:29 [PATCH 0/3] regulator: gpio-regulator: Fixes for problems that turned up with 3.5-rc1 Heiko Stübner
2012-06-03 19:30 ` [PATCH 1/3] regulator: gpio-regulator: do not pass drvdata pointer as reference Heiko Stübner
2012-06-04  0:13   ` Axel Lin
2012-06-04  9:46   ` Mark Brown
2012-06-03 19:31 ` [PATCH 2/3] regulator: gpio-regulator: Fix finding of smallest value Heiko Stübner
2012-06-04  0:14   ` Axel Lin
2012-06-03 19:32 ` Heiko Stübner [this message]
2012-06-04  0:15   ` [PATCH 3/3] regulator: gpio-regulator: populate selector from set_voltage Axel Lin

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=201206032132.06209.heiko@sntech.de \
    --to=heiko@sntech.de \
    --cc=axel.lin@gmail.com \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lrg@ti.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