From: Mark Brown <broonie@kernel.org>
To: Lee Jones <lee.jones@linaro.org>, Mark Brown <broonie@kernel.org>
Cc: linux-kernel@vger.kernel.org
Subject: Applied "regulator: pwm-regulator: Remove obsoleted property" to the regulator tree
Date: Fri, 10 Jul 2015 01:25:59 +0100 [thread overview]
Message-ID: <E1ZDM8d-0000Ry-7N@debutante> (raw)
In-Reply-To: <1436456128-18278-2-git-send-email-lee.jones@linaro.org>
The patch
regulator: pwm-regulator: Remove obsoleted property
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 f747a1fe7848453957dbdf362a42d7a6735c6ff0 Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Thu, 9 Jul 2015 16:35:27 +0100
Subject: [PATCH] regulator: pwm-regulator: Remove obsoleted property
In "[3d7ef30] regulator: pwm-regulator: Simplify voltage to duty-cycle
call" we stopped using max_duty_cycle, so we can retire it from device
data and DT.
There is no need to deprecate this property, as it hasn't hit Mainline
yet.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
Documentation/devicetree/bindings/regulator/pwm-regulator.txt | 11 ++++-------
drivers/regulator/pwm-regulator.c | 9 ---------
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/Documentation/devicetree/bindings/regulator/pwm-regulator.txt b/Documentation/devicetree/bindings/regulator/pwm-regulator.txt
index 23b47720b2e4..ed936f0f34f2 100644
--- a/Documentation/devicetree/bindings/regulator/pwm-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/pwm-regulator.txt
@@ -29,15 +29,14 @@ Required properties:
- pwms: PWM specification (See: ../pwm/pwm.txt)
-One of these must be provided:
+Only required for Voltage Table Mode:
- voltage-table: Voltage and Duty-Cycle table consisting of 2 cells
First cell is voltage in microvolts (uV)
Second cell is duty-cycle in percent (%)
-- max-duty-cycle: Maximum Duty-Cycle value -- this will normally be
- 255 (0xff) for an 8 bit PWM device
-
-If both are provided, the current default is voltage-table mode.
+NB: To be clear, if voltage-table is provided, then the device will be used
+in Voltage Table Mode. If no voltage-table is provided, then the device will
+be used in Continuous Voltage Mode.
Any property defined as part of the core regulator binding can also be used.
(See: ../regulator/regulator.txt)
@@ -49,8 +48,6 @@ Continuous Voltage Example:
regulator-min-microvolt = <1016000>;
regulator-max-microvolt = <1114000>;
regulator-name = "vdd_logic";
-
- max-duty-cycle = <255>; /* 8bit PWM */
};
Voltage Table Example:
diff --git a/drivers/regulator/pwm-regulator.c b/drivers/regulator/pwm-regulator.c
index cb482089050b..d92e66772ec0 100644
--- a/drivers/regulator/pwm-regulator.c
+++ b/drivers/regulator/pwm-regulator.c
@@ -30,7 +30,6 @@ struct pwm_regulator_data {
int state;
/* Continuous voltage */
- u32 max_duty_cycle;
int volt_uV;
};
@@ -201,14 +200,6 @@ static int pwm_regulator_init_continuous(struct platform_device *pdev,
struct pwm_regulator_data *drvdata)
{
struct device_node *np = pdev->dev.of_node;
- int ret;
-
- ret = of_property_read_u32(np, "max-duty-cycle",
- &drvdata->max_duty_cycle);
- if (ret) {
- dev_err(&pdev->dev, "Failed to read \"pwm-max-value\"\n");
- return ret;
- }
pwm_regulator_desc.ops = &pwm_regulator_voltage_continuous_ops;
pwm_regulator_desc.continuous_voltage_range = true;
--
2.1.4
next prev parent reply other threads:[~2015-07-10 0:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-09 15:35 [PATCH 1/3] regulator: pwm-regulator: Ensure headings aren't confused with properties Lee Jones
2015-07-09 15:35 ` [PATCH 2/3] regulator: pwm-regulator: Remove obsoleted property Lee Jones
2015-07-10 0:25 ` Mark Brown [this message]
2015-07-09 15:35 ` [PATCH 3/3] regulator: pwm-regulator: Small clean-ups Lee Jones
2015-07-10 0:25 ` Applied "regulator: pwm-regulator: Small clean-ups" to the regulator tree Mark Brown
2015-07-10 0:26 ` Applied "regulator: pwm-regulator: Ensure headings aren't confused with properties" " Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1ZDM8d-0000Ry-7N@debutante \
--to=broonie@kernel.org \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox