From: Markus Pargmann <mpa@pengutronix.de>
To: Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de,
Markus Pargmann <mpa@pengutronix.de>
Subject: [PATCH 2/2] regulator: core: Error on not always_on dummy regulators
Date: Tue, 25 Feb 2014 11:03:47 +0100 [thread overview]
Message-ID: <1393322627-26543-3-git-send-email-mpa@pengutronix.de> (raw)
In-Reply-To: <1393322627-26543-1-git-send-email-mpa@pengutronix.de>
It does not make sense to have dummy/fixed regulators that are not
always_on. This patch adds a check in the set_machine_constraints
function for this case and returns -EINVAL if such a regulator is
registered.
This also removes the return -EINVAL from _regulator_do_enable() if the
regulator can not be enabled.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
drivers/regulator/core.c | 27 ++++++++++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 6f71985..cb10faf 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -954,6 +954,7 @@ static int machine_constraints_current(struct regulator_dev *rdev,
}
static int _regulator_do_enable(struct regulator_dev *rdev);
+static bool regulator_can_enable(struct regulator_dev *rdev);
/**
* set_machine_constraints - sets regulator constraints
@@ -1012,12 +1013,19 @@ static int set_machine_constraints(struct regulator_dev *rdev,
}
}
+ if (!rdev->constraints->always_on && !regulator_can_enable(rdev))
+ {
+ rdev_err(rdev, "dummy regulator without always_on constraints is not valid\n");
+ ret = -EINVAL;
+ goto out;
+ }
+
/* If the constraints say the regulator should be on at this point
* and we have control then make sure it is enabled.
*/
if (rdev->constraints->always_on || rdev->constraints->boot_on) {
ret = _regulator_do_enable(rdev);
- if (ret < 0 && ret != -EINVAL) {
+ if (ret) {
rdev_err(rdev, "failed to enable\n");
goto out;
}
@@ -1739,6 +1747,21 @@ static int regulator_ena_gpio_ctrl(struct regulator_dev *rdev, bool enable)
return 0;
}
+/*
+ * Returns true if the regulator can be enabled through ops->enable or
+ * enable gpios.
+ */
+static bool regulator_can_enable(struct regulator_dev *rdev)
+{
+ if (rdev->desc->ops->enable)
+ return true;
+
+ if (rdev->ena_pin)
+ return true;
+
+ return false;
+}
+
static int _regulator_do_enable(struct regulator_dev *rdev)
{
int ret, delay;
@@ -1763,8 +1786,6 @@ static int _regulator_do_enable(struct regulator_dev *rdev)
ret = rdev->desc->ops->enable(rdev);
if (ret < 0)
return ret;
- } else {
- return -EINVAL;
}
/* Allow the regulator to ramp; it would be useful to extend
--
1.8.5.3
next prev parent reply other threads:[~2014-02-25 10:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-25 10:03 [PATCH 0/2] regulator: core: always_on fixups Markus Pargmann
2014-02-25 10:03 ` [PATCH 1/2] regulator: dummy: Should be always-on Markus Pargmann
2014-02-25 23:50 ` Mark Brown
2014-02-25 10:03 ` Markus Pargmann [this message]
2014-02-25 12:26 ` [PATCH 2/2] regulator: core: Error on not always_on dummy regulators 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=1393322627-26543-3-git-send-email-mpa@pengutronix.de \
--to=mpa@pengutronix.de \
--cc=broonie@kernel.org \
--cc=kernel@pengutronix.de \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--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).