Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755994AbcDLGbY (ORCPT ); Tue, 12 Apr 2016 02:31:24 -0400 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:34192 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755212AbcDLGbW (ORCPT ); Tue, 12 Apr 2016 02:31:22 -0400 From: Mark Brown To: Mark Brown Cc: Jon Hunter , Thierry Reding , Jon Hunter , Liam Girdwood , linux-kernel@vger.kernel.org In-Reply-To: <1460038959-21592-2-git-send-email-thierry.reding@gmail.com> Message-Id: Date: Tue, 12 Apr 2016 07:31:15 +0100 X-SA-Exim-Connect-IP: 2a01:348:6:8808:fab::3 X-SA-Exim-Mail-From: broonie@sirena.org.uk Subject: Applied "regulator: core: Use parent voltage from the supply when bypassed" to the regulator tree X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2696 Lines: 77 The patch regulator: core: Use parent voltage from the supply when bypassed has been applied to the regulator tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From fef95019016ac10e250d2c67a3c97af5797e3938 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Thu, 7 Apr 2016 16:22:36 +0200 Subject: [PATCH] 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 Signed-off-by: Mark Brown [treding@nvidia.com: return early for bypass mode] Signed-off-by: Thierry Reding Signed-off-by: Mark Brown --- drivers/regulator/core.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index e0b764284773..990fd7b3da7d 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -3109,6 +3109,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.rc3