[PATCH 1/2] regulator: core: Only propagate voltage changes to if it can change voltages

[PATCH 1/2] regulator: core: Only propagate voltage changes to if it can change voltages

[Mark Brown]

When we are propagating voltage changes to parent regulators don't
bother if the parent does not have permission to change voltages.  This
simplifies error checking in the function for cases where the regulator
lacks some of the voltage operations.

Reported-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---

Untested.

 drivers/regulator/core.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 82205cc5daa7..2b464a286451 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2959,8 +2959,10 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator,
 	if (ret < 0)
 		goto out2;
 
-	if (rdev->supply && (rdev->desc->min_dropout_uV ||
-				!rdev->desc->ops->get_voltage)) {
+	if (rdev->supply &&
+	    regulator_ops_is_valid(rdev->supply->rdev,
+				   REGULATOR_CHANGE_VOLTAGE) &&
+	    (rdev->desc->min_dropout_uV || !rdev->desc->ops->get_voltage)) {
 		int current_supply_uV;
 		int selector;
 
-- 
2.11.0

[PATCH 2/2] regulator: core: Allow dummy regulators for supplies

[Mark Brown]

Rather than just not resolving the supply when there is explicitly no
supply mapping fall through and allow a dummy supply to be substituted.

Signed-off-by: Mark Brown <broonie@kernel.org>
---
 drivers/regulator/core.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 2b464a286451..047ada74aa4a 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1533,14 +1533,6 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
 	if (IS_ERR(r)) {
 		ret = PTR_ERR(r);
 
-		if (ret == -ENODEV) {
-			/*
-			 * No supply was specified for this regulator and
-			 * there will never be one.
-			 */
-			return 0;
-		}
-
 		/* Did the lookup explicitly defer for us? */
 		if (ret == -EPROBE_DEFER)
 			return ret;
-- 
2.11.0

Re: [PATCH 2/2] regulator: core: Allow dummy regulators for supplies

[Dong Aisheng]

On Thu, Apr 13, 2017 at 07:03:16PM +0100, Mark Brown wrote:
> Rather than just not resolving the supply when there is explicitly no
> supply mapping fall through and allow a dummy supply to be substituted.
> 
> Signed-off-by: Mark Brown <broonie@kernel.org>

Tested-by: Dong Aisheng <aisheng.dong@nxp.com>
Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com>

Regards
Dong Aisheng

Re: [PATCH 1/2] regulator: core: Only propagate voltage changes to if it can change voltages

[Dong Aisheng]

On Thu, Apr 13, 2017 at 07:03:15PM +0100, Mark Brown wrote:
> When we are propagating voltage changes to parent regulators don't
> bother if the parent does not have permission to change voltages.  This
> simplifies error checking in the function for cases where the regulator
> lacks some of the voltage operations.
> 
> Reported-by: Dong Aisheng <aisheng.dong@nxp.com>
> Signed-off-by: Mark Brown <broonie@kernel.org>
> ---
> 
> Untested.
> 

Thanks for the fix.

Tested-by: Dong Aisheng <aisheng.dong@nxp.com>
Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com>

Regards
Dong Aisheng

Applied "regulator: core: Only propagate voltage changes to if it can change voltages" to the regulator tree

[Mark Brown]

The patch

   regulator: core: Only propagate voltage changes to if it can change voltages

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 43fc99f293cc802866bea904ca2f1f8573f236f7 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@kernel.org>
Date: Thu, 13 Apr 2017 18:36:59 +0100
Subject: [PATCH] regulator: core: Only propagate voltage changes to if it can
 change voltages

When we are propagating voltage changes to parent regulators don't
bother if the parent does not have permission to change voltages.  This
simplifies error checking in the function for cases where the regulator
lacks some of the voltage operations.

Reported-by: Dong Aisheng <aisheng.dong@nxp.com>
Tested-by: Dong Aisheng <aisheng.dong@nxp.com>
Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 drivers/regulator/core.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index aff302dfab5d..3f424ec4fc56 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2939,8 +2939,10 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator,
 	if (ret < 0)
 		goto out2;
 
-	if (rdev->supply && (rdev->desc->min_dropout_uV ||
-				!rdev->desc->ops->get_voltage)) {
+	if (rdev->supply &&
+	    regulator_ops_is_valid(rdev->supply->rdev,
+				   REGULATOR_CHANGE_VOLTAGE) &&
+	    (rdev->desc->min_dropout_uV || !rdev->desc->ops->get_voltage)) {
 		int current_supply_uV;
 		int selector;
 
-- 
2.11.0

Applied "regulator: core: Only propagate voltage changes to if it can change voltages" to the regulator tree

[Mark Brown]

The patch

   regulator: core: Only propagate voltage changes to if it can change voltages

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 c8b2a4b5f2ab769d921668c2e844a8b78ca0bcd4 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@kernel.org>
Date: Thu, 13 Apr 2017 18:36:59 +0100
Subject: [PATCH] regulator: core: Only propagate voltage changes to if it can
 change voltages

When we are propagating voltage changes to parent regulators don't
bother if the parent does not have permission to change voltages.  This
simplifies error checking in the function for cases where the regulator
lacks some of the voltage operations.

Reported-by: Dong Aisheng <aisheng.dong@nxp.com>
Tested-by: Dong Aisheng <aisheng.dong@nxp.com>
Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 drivers/regulator/core.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 04baac9a165b..33776bf5d9b4 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2921,8 +2921,10 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator,
 	if (ret < 0)
 		goto out2;
 
-	if (rdev->supply && (rdev->desc->min_dropout_uV ||
-				!rdev->desc->ops->get_voltage)) {
+	if (rdev->supply &&
+	    regulator_ops_is_valid(rdev->supply->rdev,
+				   REGULATOR_CHANGE_VOLTAGE) &&
+	    (rdev->desc->min_dropout_uV || !rdev->desc->ops->get_voltage)) {
 		int current_supply_uV;
 		int selector;
 
-- 
2.11.0