From: Sascha Hauer <s.hauer@pengutronix.de>
To: linux-kernel@vger.kernel.org
Cc: Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
kernel@pengutronix.de, alkml@pengutronix.de,
Sascha Hauer <s.hauer@pengutronix.de>
Subject: [PATCH 1/8] regulator: core: create unlocked version of regulator_list_voltage
Date: Tue, 13 Oct 2015 12:45:24 +0200 [thread overview]
Message-ID: <1444733131-26995-2-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1444733131-26995-1-git-send-email-s.hauer@pengutronix.de>
The unlocked version will be needed when we start propagating voltage
changes to the supply regulators.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/regulator/core.c | 62 +++++++++++++++++++++++++++---------------------
1 file changed, 35 insertions(+), 27 deletions(-)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 8a34f6a..bab426d 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2312,6 +2312,40 @@ static int _regulator_is_enabled(struct regulator_dev *rdev)
return rdev->desc->ops->is_enabled(rdev);
}
+static int _regulator_list_voltage(struct regulator *regulator,
+ unsigned selector, int lock)
+{
+ struct regulator_dev *rdev = regulator->rdev;
+ const struct regulator_ops *ops = rdev->desc->ops;
+ int ret;
+
+ if (rdev->desc->fixed_uV && rdev->desc->n_voltages == 1 && !selector)
+ return rdev->desc->fixed_uV;
+
+ if (ops->list_voltage) {
+ if (selector >= rdev->desc->n_voltages)
+ return -EINVAL;
+ if (lock)
+ mutex_lock(&rdev->mutex);
+ ret = ops->list_voltage(rdev, selector);
+ if (lock)
+ mutex_unlock(&rdev->mutex);
+ } else if (rdev->supply) {
+ ret = _regulator_list_voltage(rdev->supply, selector, lock);
+ } else {
+ return -EINVAL;
+ }
+
+ if (ret > 0) {
+ if (ret < rdev->constraints->min_uV)
+ ret = 0;
+ else if (ret > rdev->constraints->max_uV)
+ ret = 0;
+ }
+
+ return ret;
+}
+
/**
* regulator_is_enabled - is the regulator output enabled
* @regulator: regulator source
@@ -2401,33 +2435,7 @@ EXPORT_SYMBOL_GPL(regulator_count_voltages);
*/
int regulator_list_voltage(struct regulator *regulator, unsigned selector)
{
- struct regulator_dev *rdev = regulator->rdev;
- const struct regulator_ops *ops = rdev->desc->ops;
- int ret;
-
- if (rdev->desc->fixed_uV && rdev->desc->n_voltages == 1 && !selector)
- return rdev->desc->fixed_uV;
-
- if (ops->list_voltage) {
- if (selector >= rdev->desc->n_voltages)
- return -EINVAL;
- mutex_lock(&rdev->mutex);
- ret = ops->list_voltage(rdev, selector);
- mutex_unlock(&rdev->mutex);
- } else if (rdev->supply) {
- ret = regulator_list_voltage(rdev->supply, selector);
- } else {
- return -EINVAL;
- }
-
- if (ret > 0) {
- if (ret < rdev->constraints->min_uV)
- ret = 0;
- else if (ret > rdev->constraints->max_uV)
- ret = 0;
- }
-
- return ret;
+ return _regulator_list_voltage(regulator, selector, 1);
}
EXPORT_SYMBOL_GPL(regulator_list_voltage);
--
2.6.1
next prev parent reply other threads:[~2015-10-13 10:46 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-13 10:45 [PATCH v2] regulator: Propagate voltage changes to supply regulators Sascha Hauer
2015-10-13 10:45 ` Sascha Hauer [this message]
2015-10-16 15:26 ` [PATCH 1/8] regulator: core: create unlocked version of regulator_list_voltage Mark Brown
2015-10-13 10:45 ` [PATCH 2/8] regulator: core: create unlocked version of regulator_set_voltage Sascha Hauer
2015-10-16 17:04 ` Applied "regulator: core: create unlocked version of regulator_set_voltage" to the regulator tree Mark Brown
2015-10-13 10:45 ` [PATCH 3/8] regulator: introduce min_dropout_uv Sascha Hauer
2015-10-16 16:11 ` Mark Brown
2015-10-16 16:41 ` Applied "regulator: introduce min_dropout_uv" to the regulator tree Mark Brown
2015-10-16 16:57 ` Mark Brown
2015-10-13 10:45 ` [PATCH 4/8] regulator: core: introduce function to lock regulators and its supplies Sascha Hauer
2015-10-13 10:45 ` [PATCH 5/8] regulator: introduce regulator_get_voltage_floor Sascha Hauer
2015-10-16 16:50 ` Mark Brown
2015-10-20 12:26 ` Sascha Hauer
2015-10-13 10:45 ` [PATCH 6/8] regulator: core: Propagate voltage changes to supply regulators Sascha Hauer
2015-10-16 16:55 ` Mark Brown
2015-10-13 10:45 ` [PATCH 7/8] regulator: i.MX anatop: Allow supply regulator Sascha Hauer
2015-10-13 10:45 ` [PATCH 8/8] ARM: i.MX6 Phytec PFLA02: Add supplies for the SoC internal regulators Sascha Hauer
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=1444733131-26995-2-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=alkml@pengutronix.de \
--cc=broonie@kernel.org \
--cc=kernel@pengutronix.de \
--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;
as well as URLs for NNTP newsgroup(s).