Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756411AbcDGOWu (ORCPT ); Thu, 7 Apr 2016 10:22:50 -0400 Received: from mail-pf0-f171.google.com ([209.85.192.171]:33853 "EHLO mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756361AbcDGOWr (ORCPT ); Thu, 7 Apr 2016 10:22:47 -0400 From: Thierry Reding To: Mark Brown Cc: Jon Hunter , Liam Girdwood , linux-kernel@vger.kernel.org Subject: [PATCH 2/5] regulator: core: Use parent voltage from the supply when bypassed Date: Thu, 7 Apr 2016 16:22:36 +0200 Message-Id: <1460038959-21592-2-git-send-email-thierry.reding@gmail.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1460038959-21592-1-git-send-email-thierry.reding@gmail.com> References: <1460038959-21592-1-git-send-email-thierry.reding@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1489 Lines: 45 From: Mark Brown 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 Signed-off-by: Mark Brown [treding@nvidia.com: return early for bypass mode] Signed-off-by: Thierry Reding --- drivers/regulator/core.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index cc0333a79924..23c8c4c86389 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -3118,6 +3118,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); -- 2.8.0