Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757095AbcCaO2G (ORCPT ); Thu, 31 Mar 2016 10:28:06 -0400 Received: from hqemgate15.nvidia.com ([216.228.121.64]:9335 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756607AbcCaO2F (ORCPT ); Thu, 31 Mar 2016 10:28:05 -0400 X-PGP-Universal: processed; by hqnvupgp07.nvidia.com on Thu, 31 Mar 2016 07:26:16 -0700 Subject: Re: [PATCH] regulator: core: Use parent voltage from the supply when bypassed To: Mark Brown , Liam Girdwood References: <1459359124-22436-1-git-send-email-broonie@kernel.org> CC: , "linux-tegra@vger.kernel.org" From: Jon Hunter Message-ID: <56FD33EE.6030109@nvidia.com> Date: Thu, 31 Mar 2016 15:27:58 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <1459359124-22436-1-git-send-email-broonie@kernel.org> X-Originating-IP: [10.21.132.115] X-ClientProxiedBy: UKMAIL102.nvidia.com (10.26.138.15) To UKMAIL101.nvidia.com (10.26.138.13) Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1919 Lines: 58 On 30/03/16 18:32, Mark Brown wrote: > 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 > --- > > Completely untested. > > drivers/regulator/core.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c > index 74e8a7a3b3e8..03042e450399 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 (rdev->supply) { > + ret = _regulator_get_voltage(rdev->supply->rdev); Should this be a return here? > + } else { > + return -EINVAL; > + } > + } > + } > > if (rdev->desc->ops->get_voltage_sel) { > sel = rdev->desc->ops->get_voltage_sel(rdev); > I gave this a quick test on tegra124 having populated the get/set_bypass() operators for the as3722. In this case, there is still a problem because _regulator_get_voltage() is called during regulator registration when set_machine_constraints() is called, which is before we have called regulator_register_resolve_supply(). Therefore, it seems to me that we still need to resolve the supply before we call set_machine_constraints(). Jon