From: Mark Brown <broonie@kernel.org>
Date: Thu, 7 Apr 2016 14:22:36 +0000 (+0200)
Subject: UPSTREAM: regulator: core: Use parent voltage from the supply when bypassed
X-Git-Tag: firefly_0821_release~467
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=e8177c76214dbc92f1342f28231928dfcb8866ba;p=firefly-linux-kernel-4.4.55.git

UPSTREAM: regulator: core: Use parent voltage from the supply when bypassed

When a regulator is in bypass mode it is functioning as a switch
returning the voltage set in the regulator will not give the voltage
being output by the regulator as it's just passing through its supply.
This means that when we are getting the voltage from a regulator we
should check to see if it is in bypass mode and if it is we should
report the voltage from the supply rather than that which is set on the
regulator.

Reported-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
[treding@nvidia.com: return early for bypass mode]
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

(cherry picked from commit fef95019016ac10e250d2c67a3c97af5797e3938)

Change-Id: I889789bce3018bec24ba9a0476217c0573ce9a27
Signed-off-by: David Wu <david.wu@rock-chips.com>
---

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 34ae2745d3f3..f87310970f17 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -3116,6 +3116,20 @@ EXPORT_SYMBOL_GPL(regulator_sync_voltage);
 static int _regulator_get_voltage(struct regulator_dev *rdev)
 {
 	int sel, ret;
+	bool bypassed;
+
+	if (rdev->desc->ops->get_bypass) {
+		ret = rdev->desc->ops->get_bypass(rdev, &bypassed);
+		if (ret < 0)
+			return ret;
+		if (bypassed) {
+			/* if bypassed the regulator must have a supply */
+			if (!rdev->supply)
+				return -EINVAL;
+
+			return _regulator_get_voltage(rdev->supply->rdev);
+		}
+	}
 
 	if (rdev->desc->ops->get_voltage_sel) {
 		sel = rdev->desc->ops->get_voltage_sel(rdev);