Applied "regulator: pwm: Drop unneeded pwm_enable() call" to the regulator tree

Mark Brown broonie at
Fri Jun 3 04:08:47 PDT 2016

The patch

   regulator: pwm: Drop unneeded pwm_enable() call

has been applied to the regulator tree at


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.


>From 830583004e615a4637eacc77866b84908414d7a0 Mon Sep 17 00:00:00 2001
From: Boris Brezillon <boris.brezillon at>
Date: Fri, 3 Jun 2016 10:23:00 +0200
Subject: [PATCH] regulator: pwm: Drop unneeded pwm_enable() call

Now that the PWM regulator driver implements the ->enable/disable() hooks
we can remove the pwm_enable() call from pwm_regulator_set_voltage().

Signed-off-by: Boris Brezillon <boris.brezillon at>
Signed-off-by: Mark Brown <broonie at>
 drivers/regulator/pwm-regulator.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/regulator/pwm-regulator.c b/drivers/regulator/pwm-regulator.c
index fafa3488e960..ab3cc0235843 100644
--- a/drivers/regulator/pwm-regulator.c
+++ b/drivers/regulator/pwm-regulator.c
@@ -159,11 +159,6 @@ static int pwm_regulator_set_voltage(struct regulator_dev *rdev,
 		return ret;
-	ret = pwm_enable(drvdata->pwm);
-	if (ret) {
-		dev_err(&rdev->dev, "Failed to enable PWM: %d\n", ret);
-		return ret;
-	}
 	drvdata->volt_uV = min_uV;
 	/* Delay required by PWM regulator to settle to the new voltage */

More information about the Linux-rockchip mailing list