From: Boris Brezillon <boris.brezillon@free-electrons.com>
To: Thierry Reding <thierry.reding@gmail.com>,
linux-pwm@vger.kernel.org, Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>
Cc: Heiko Stuebner <heiko@sntech.de>,
linux-rockchip@lists.infradead.org,
Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Milo Kim <milo.kim@ti.com>,
Doug Anderson <dianders@google.com>,
Caesar Wang <wxt@rock-chips.com>,
Stephen Barber <smbarber@chromium.org>,
Brian Norris <briannorris@chromium.org>,
Ajit Pal Singh <ajitpal.singh@st.com>,
Srinivas Kandagatla <srinivas.kandagatla@gmail.com>,
Maxime Coquelin <maxime.coquelin@st.com>,
Patrice Chotard <patrice.chotard@st.com>,
kernel@stlinux.com, Laxman Dewangan <ldewangan@nvidia.com>,
Boris Brezillon <boris.brezillon@free-electrons.com>
Subject: [PATCH v3 13/14] regulator: pwm: Support extra continuous mode cases
Date: Tue, 14 Jun 2016 11:13:21 +0200 [thread overview]
Message-ID: <1465895602-31008-14-git-send-email-boris.brezillon@free-electrons.com> (raw)
In-Reply-To: <1465895602-31008-1-git-send-email-boris.brezillon@free-electrons.com>
The continuous mode allows one to declare a PWM regulator without having
to declare the voltage <-> dutycycle association table. It works fine as
long as your voltage(dutycycle) function is linear, but also has the
following constraints:
- dutycycle for min_uV = 0%
- dutycycle for max_uV = 100%
- dutycycle for min_uV < dutycycle for max_uV
While the linearity constraint is acceptable for now, we sometimes need to
restrict of the PWM range (to limit the maximum/minimum voltage for
example) or have a min_uV_dutycycle > max_uV_dutycycle (this could be
tweaked with PWM polarity, but not all PWMs support inverted polarity).
Add the pwm-dutycycle-range and pwm-dutycycle-unit DT properties to define
such constraints. If those properties are not defined, the PWM regulator
use the default pwm-dutycycle-range = <0 100> and
pwm-dutycycle-unit = <100> values (existing behavior).
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Reviewed-by: Brian Norris <briannorris@chromium.org>
Tested-by: Brian Norris <briannorris@chromium.org>
Tested-by: Heiko Stuebner <heiko@sntech.de>
---
drivers/regulator/pwm-regulator.c | 90 +++++++++++++++++++++++++++++++++++----
1 file changed, 81 insertions(+), 9 deletions(-)
diff --git a/drivers/regulator/pwm-regulator.c b/drivers/regulator/pwm-regulator.c
index 80d083f..fa1c74c 100644
--- a/drivers/regulator/pwm-regulator.c
+++ b/drivers/regulator/pwm-regulator.c
@@ -21,6 +21,12 @@
#include <linux/of_device.h>
#include <linux/pwm.h>
+struct pwm_continuous_reg_data {
+ unsigned int min_uV_dutycycle;
+ unsigned int max_uV_dutycycle;
+ unsigned int dutycycle_unit;
+};
+
struct pwm_regulator_data {
/* Shared */
struct pwm_device *pwm;
@@ -28,6 +34,9 @@ struct pwm_regulator_data {
/* Voltage table */
struct pwm_voltages *duty_cycle_table;
+ /* Continuous mode info */
+ struct pwm_continuous_reg_data continuous;
+
/* regulator descriptor */
struct regulator_desc desc;
@@ -132,31 +141,77 @@ static int pwm_regulator_is_enabled(struct regulator_dev *dev)
static int pwm_regulator_get_voltage(struct regulator_dev *rdev)
{
struct pwm_regulator_data *drvdata = rdev_get_drvdata(rdev);
+ unsigned int min_uV_duty = drvdata->continuous.min_uV_dutycycle;
+ unsigned int max_uV_duty = drvdata->continuous.max_uV_dutycycle;
+ unsigned int duty_unit = drvdata->continuous.dutycycle_unit;
int min_uV = rdev->constraints->min_uV;
- int diff = rdev->constraints->max_uV - min_uV;
+ int max_uV = rdev->constraints->max_uV;
+ int diff_uV = max_uV - min_uV;
struct pwm_state pstate;
+ unsigned int diff_duty;
+ unsigned int voltage;
pwm_get_state(drvdata->pwm, &pstate);
- return min_uV + pwm_get_relative_duty_cycle(&pstate, diff);
+ voltage = pwm_get_relative_duty_cycle(&pstate, duty_unit);
+
+ /*
+ * The dutycycle for min_uV might be greater than the one for max_uV.
+ * This is happening when the user needs an inversed polarity, but the
+ * PWM device does not support inversing it in hardware.
+ */
+ if (max_uV_duty < min_uV_duty) {
+ voltage = min_uV_duty - voltage;
+ diff_duty = min_uV_duty - max_uV_duty;
+ } else {
+ voltage = voltage - min_uV_duty;
+ diff_duty = max_uV_duty - min_uV_duty;
+ }
+
+ voltage = DIV_ROUND_CLOSEST_ULL((u64)voltage * diff_uV, diff_duty);
+
+ return voltage + min_uV;
}
static int pwm_regulator_set_voltage(struct regulator_dev *rdev,
- int min_uV, int max_uV,
- unsigned *selector)
+ int req_min_uV, int req_max_uV,
+ unsigned int *selector)
{
struct pwm_regulator_data *drvdata = rdev_get_drvdata(rdev);
+ unsigned int min_uV_duty = drvdata->continuous.min_uV_dutycycle;
+ unsigned int max_uV_duty = drvdata->continuous.max_uV_dutycycle;
+ unsigned int duty_unit = drvdata->continuous.dutycycle_unit;
unsigned int ramp_delay = rdev->constraints->ramp_delay;
- unsigned int req_diff = min_uV - rdev->constraints->min_uV;
+ int min_uV = rdev->constraints->min_uV;
+ int max_uV = rdev->constraints->max_uV;
+ int diff_uV = max_uV - min_uV;
struct pwm_state pstate;
- unsigned int diff;
+ unsigned int diff_duty;
+ unsigned int dutycycle;
int ret;
pwm_init_state(drvdata->pwm, &pstate);
- diff = rdev->constraints->max_uV - rdev->constraints->min_uV;
- /* We pass diff as the scale to get a uV precision. */
- pwm_set_relative_duty_cycle(&pstate, req_diff, diff);
+ /*
+ * The dutycycle for min_uV might be greater than the one for max_uV.
+ * This is happening when the user needs an inversed polarity, but the
+ * PWM device does not support inversing it in hardware.
+ */
+ if (max_uV_duty < min_uV_duty)
+ diff_duty = min_uV_duty - max_uV_duty;
+ else
+ diff_duty = max_uV_duty - min_uV_duty;
+
+ dutycycle = DIV_ROUND_CLOSEST_ULL((u64)(req_min_uV - min_uV) *
+ diff_duty,
+ diff_uV);
+
+ if (max_uV_duty < min_uV_duty)
+ dutycycle = min_uV_duty - dutycycle;
+ else
+ dutycycle = min_uV_duty + dutycycle;
+
+ pwm_set_relative_duty_cycle(&pstate, dutycycle, duty_unit);
ret = pwm_apply_state(drvdata->pwm, &pstate);
if (ret) {
@@ -237,11 +292,28 @@ static int pwm_regulator_init_table(struct platform_device *pdev,
static int pwm_regulator_init_continuous(struct platform_device *pdev,
struct pwm_regulator_data *drvdata)
{
+ u32 dutycycle_range[2] = { 0, 100 };
+ u32 dutycycle_unit = 100;
+
memcpy(&drvdata->ops, &pwm_regulator_voltage_continuous_ops,
sizeof(drvdata->ops));
drvdata->desc.ops = &drvdata->ops;
drvdata->desc.continuous_voltage_range = true;
+ of_property_read_u32_array(pdev->dev.of_node,
+ "pwm-dutycycle-range",
+ dutycycle_range, 2);
+ of_property_read_u32(pdev->dev.of_node, "pwm-dutycycle-unit",
+ &dutycycle_unit);
+
+ if (dutycycle_range[0] > dutycycle_unit ||
+ dutycycle_range[1] > dutycycle_unit)
+ return -EINVAL;
+
+ drvdata->continuous.dutycycle_unit = dutycycle_unit;
+ drvdata->continuous.min_uV_dutycycle = dutycycle_range[0];
+ drvdata->continuous.max_uV_dutycycle = dutycycle_range[1];
+
return 0;
}
--
2.7.4
next prev parent reply other threads:[~2016-06-14 9:14 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-14 9:13 [PATCH v3 00/14] regulator: pwm: various improvements Boris Brezillon
2016-06-14 9:13 ` [PATCH v3 01/14] pwm: Add an helper to prepare a new PWM state Boris Brezillon
2016-06-14 9:13 ` [PATCH v3 02/14] pwm: Add two helpers to ease relative duty cycle manipulation Boris Brezillon
2016-06-14 9:13 ` [PATCH v3 03/14] pwm: rockchip: Fix period and duty_cycle approximation Boris Brezillon
2016-06-14 9:13 ` [PATCH v3 04/14] pwm: rockchip: Add support for hardware readout Boris Brezillon
2016-06-14 9:13 ` [PATCH v3 05/14] pwm: rockchip: Avoid glitches on already running PWMs Boris Brezillon
2016-06-14 9:13 ` [PATCH v3 06/14] pwm: rockchip: Add support for atomic update Boris Brezillon
2016-06-14 9:13 ` [PATCH v3 07/14] pwm: sti: Add support for hardware readout Boris Brezillon
2016-06-14 9:13 ` [PATCH v3 08/14] pwm: sti: Avoid glitches on already running PWMs Boris Brezillon
2016-06-14 9:13 ` [PATCH v3 09/14] regulator: pwm: Adjust PWM config at probe time Boris Brezillon
2016-06-14 9:13 ` [PATCH v3 10/14] regulator: pwm: Switch to the atomic PWM API Boris Brezillon
2016-07-05 14:30 ` Mark Brown
2016-06-14 9:13 ` [PATCH v3 11/14] regulator: pwm: Properly initialize the ->state field Boris Brezillon
2016-07-05 14:31 ` Mark Brown
2016-06-14 9:13 ` [PATCH v3 12/14] regulator: pwm: Retrieve correct voltage Boris Brezillon
2016-07-05 14:32 ` Mark Brown
2016-07-08 15:43 ` Thierry Reding
2016-07-09 9:47 ` Mark Brown
2016-07-11 7:02 ` Thierry Reding
2016-07-11 7:20 ` Boris Brezillon
2016-07-11 16:53 ` Doug Anderson
2016-06-14 9:13 ` Boris Brezillon [this message]
2016-07-05 14:34 ` [PATCH v3 13/14] regulator: pwm: Support extra continuous mode cases Mark Brown
2016-06-14 9:13 ` [PATCH v3 14/14] regulator: pwm: Document pwm-dutycycle-unit and pwm-dutycycle-range Boris Brezillon
2016-06-16 22:26 ` Rob Herring
2016-07-05 14:36 ` Mark Brown
2016-07-08 16:35 ` [PATCH v3 00/14] regulator: pwm: various improvements Thierry Reding
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=1465895602-31008-14-git-send-email-boris.brezillon@free-electrons.com \
--to=boris.brezillon@free-electrons.com \
--cc=ajitpal.singh@st.com \
--cc=briannorris@chromium.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dianders@google.com \
--cc=galak@codeaurora.org \
--cc=heiko@sntech.de \
--cc=ijc+devicetree@hellion.org.uk \
--cc=kernel@stlinux.com \
--cc=ldewangan@nvidia.com \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=maxime.coquelin@st.com \
--cc=milo.kim@ti.com \
--cc=patrice.chotard@st.com \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=smbarber@chromium.org \
--cc=srinivas.kandagatla@gmail.com \
--cc=thierry.reding@gmail.com \
--cc=wxt@rock-chips.com \
/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;
as well as URLs for NNTP newsgroup(s).