Merge remote-tracking branch 'regulator/topic/bypass' into regulator-next

1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 6af38691ec48..0cbfd3feccef 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);