From: Thierry Reding <thierry.reding@gmail.com>
To: Mark Brown <broonie@kernel.org>
Cc: Jon Hunter <jonathanh@nvidia.com>,
Liam Girdwood <lgirdwood@gmail.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 3/5] regulator: helpers: Ensure bypass register field matches ON value
Date: Thu, 7 Apr 2016 16:22:37 +0200 [thread overview]
Message-ID: <1460038959-21592-3-git-send-email-thierry.reding@gmail.com> (raw)
In-Reply-To: <1460038959-21592-1-git-send-email-thierry.reding@gmail.com>
From: Jon Hunter <jonathanh@nvidia.com>
When checking the bypass state for a regulator, we check to see if any
bits in the bypass mask are set. For most cases this is fine because
there is typically only a single bit used to determine if the regulator
is in bypass. However, for some regulators, such as LDO6 on AS3722, the
bypass state is indicated by a value rather than a single bit.
Therefore, when checking the bypass state, check that the bypass field
matches the ON value.
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
drivers/regulator/helpers.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/regulator/helpers.c b/drivers/regulator/helpers.c
index b1e32e7482e9..bcf38fd5106a 100644
--- a/drivers/regulator/helpers.c
+++ b/drivers/regulator/helpers.c
@@ -460,7 +460,7 @@ int regulator_get_bypass_regmap(struct regulator_dev *rdev, bool *enable)
if (ret != 0)
return ret;
- *enable = val & rdev->desc->bypass_mask;
+ *enable = (val & rdev->desc->bypass_mask) == rdev->desc->bypass_val_on;
return 0;
}
--
2.8.0
next prev parent reply other threads:[~2016-04-07 14:22 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-07 14:22 [PATCH 1/5] regulator: core: Resolve supply earlier Thierry Reding
2016-04-07 14:22 ` [PATCH 2/5] regulator: core: Use parent voltage from the supply when bypassed Thierry Reding
2016-04-12 6:31 ` Applied "regulator: core: Use parent voltage from the supply when bypassed" to the regulator tree Mark Brown
2016-04-07 14:22 ` Thierry Reding [this message]
2016-04-22 10:49 ` Applied "regulator: helpers: Ensure bypass register field matches ON value" " Mark Brown
2016-04-07 14:22 ` [PATCH 4/5] regulator: as3722: Add bypass support for LDO6 Thierry Reding
2016-04-11 16:15 ` Applied "regulator: as3722: Add bypass support for LDO6" to the regulator tree Mark Brown
2016-04-07 14:22 ` [PATCH 5/5] regulator: as3722: Constify regulator ops Thierry Reding
2016-04-11 16:15 ` Applied "regulator: as3722: Constify regulator ops" to the regulator tree Mark Brown
2016-04-11 10:59 ` [PATCH 1/5] regulator: core: Resolve supply earlier Jon Hunter
2016-04-11 11:46 ` Thierry Reding
2016-04-11 12:19 ` Jon Hunter
2016-04-11 12:49 ` Mark Brown
2016-04-11 14:03 ` Javier Martinez Canillas
2016-04-11 12:58 ` Mark Brown
2016-04-11 13:09 ` Thierry Reding
2016-04-11 13:45 ` Javier Martinez Canillas
2016-04-11 13:57 ` Mark Brown
2016-04-11 14:07 ` Thierry Reding
2016-04-11 14:32 ` Mark Brown
2016-04-11 14:49 ` Thierry Reding
2016-04-11 15:50 ` Mark Brown
2016-04-11 13:56 ` Mark Brown
2016-04-11 14:03 ` Mark Brown
2016-04-11 14:11 ` Thierry Reding
2016-04-11 14:16 ` Mark Brown
2016-04-19 10:16 ` Jon Hunter
2016-04-19 11:03 ` Thierry Reding
2016-04-19 15:40 ` Mark Brown
2016-04-19 16:09 ` Jon Hunter
2016-04-20 15:21 ` Mark Brown
2016-04-21 15:34 ` Jon Hunter
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=1460038959-21592-3-git-send-email-thierry.reding@gmail.com \
--to=thierry.reding@gmail.com \
--cc=broonie@kernel.org \
--cc=jonathanh@nvidia.com \
--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).