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 11/14] regulator: pwm: Properly initialize the ->state field Date: Tue, 14 Jun 2016 11:13:19 +0200 [thread overview] Message-ID: <1465895602-31008-12-git-send-email-boris.brezillon@free-electrons.com> (raw) In-Reply-To: <1465895602-31008-1-git-send-email-boris.brezillon@free-electrons.com> The ->state field is currently initialized to 0, thus referencing the voltage selector at index 0, which might not reflect the current voltage value. If possible, retrieve the current voltage selector from the PWM state, else return -EINVAL. Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Tested-by: Brian Norris <briannorris@chromium.org> Tested-by: Heiko Stuebner <heiko@sntech.de> --- Mark, I know you already added your Acked-by tag on this patch but this version has slightly change and is now making use of the pwm_get_relative_duty_cycle() helper instead of manually converting the absolute duty_cycle value into a relative one. --- drivers/regulator/pwm-regulator.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/drivers/regulator/pwm-regulator.c b/drivers/regulator/pwm-regulator.c index ad75360..2000118 100644 --- a/drivers/regulator/pwm-regulator.c +++ b/drivers/regulator/pwm-regulator.c @@ -48,10 +48,31 @@ struct pwm_voltages { /** * Voltage table call-backs */ +static void pwm_regulator_init_state(struct regulator_dev *rdev) +{ + struct pwm_regulator_data *drvdata = rdev_get_drvdata(rdev); + struct pwm_state pwm_state; + unsigned int dutycycle; + int i; + + pwm_get_state(drvdata->pwm, &pwm_state); + dutycycle = pwm_get_relative_duty_cycle(&pwm_state, 100); + + for (i = 0; i < rdev->desc->n_voltages; i++) { + if (dutycycle == drvdata->duty_cycle_table[i].dutycycle) { + drvdata->state = i; + return; + } + } +} + static int pwm_regulator_get_voltage_sel(struct regulator_dev *rdev) { struct pwm_regulator_data *drvdata = rdev_get_drvdata(rdev); + if (drvdata->state < 0) + pwm_regulator_init_state(rdev); + return drvdata->state; } @@ -203,6 +224,7 @@ static int pwm_regulator_init_table(struct platform_device *pdev, return ret; } + drvdata->state = -EINVAL; drvdata->duty_cycle_table = duty_cycle_table; memcpy(&drvdata->ops, &pwm_regulator_voltage_table_ops, sizeof(drvdata->ops)); -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: boris.brezillon@free-electrons.com (Boris Brezillon) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 11/14] regulator: pwm: Properly initialize the ->state field Date: Tue, 14 Jun 2016 11:13:19 +0200 [thread overview] Message-ID: <1465895602-31008-12-git-send-email-boris.brezillon@free-electrons.com> (raw) In-Reply-To: <1465895602-31008-1-git-send-email-boris.brezillon@free-electrons.com> The ->state field is currently initialized to 0, thus referencing the voltage selector at index 0, which might not reflect the current voltage value. If possible, retrieve the current voltage selector from the PWM state, else return -EINVAL. Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Tested-by: Brian Norris <briannorris@chromium.org> Tested-by: Heiko Stuebner <heiko@sntech.de> --- Mark, I know you already added your Acked-by tag on this patch but this version has slightly change and is now making use of the pwm_get_relative_duty_cycle() helper instead of manually converting the absolute duty_cycle value into a relative one. --- drivers/regulator/pwm-regulator.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/drivers/regulator/pwm-regulator.c b/drivers/regulator/pwm-regulator.c index ad75360..2000118 100644 --- a/drivers/regulator/pwm-regulator.c +++ b/drivers/regulator/pwm-regulator.c @@ -48,10 +48,31 @@ struct pwm_voltages { /** * Voltage table call-backs */ +static void pwm_regulator_init_state(struct regulator_dev *rdev) +{ + struct pwm_regulator_data *drvdata = rdev_get_drvdata(rdev); + struct pwm_state pwm_state; + unsigned int dutycycle; + int i; + + pwm_get_state(drvdata->pwm, &pwm_state); + dutycycle = pwm_get_relative_duty_cycle(&pwm_state, 100); + + for (i = 0; i < rdev->desc->n_voltages; i++) { + if (dutycycle == drvdata->duty_cycle_table[i].dutycycle) { + drvdata->state = i; + return; + } + } +} + static int pwm_regulator_get_voltage_sel(struct regulator_dev *rdev) { struct pwm_regulator_data *drvdata = rdev_get_drvdata(rdev); + if (drvdata->state < 0) + pwm_regulator_init_state(rdev); + return drvdata->state; } @@ -203,6 +224,7 @@ static int pwm_regulator_init_table(struct platform_device *pdev, return ret; } + drvdata->state = -EINVAL; drvdata->duty_cycle_table = duty_cycle_table; memcpy(&drvdata->ops, &pwm_regulator_voltage_table_ops, sizeof(drvdata->ops)); -- 2.7.4
next prev parent reply other threads:[~2016-06-14 9:15 UTC|newest] Thread overview: 68+ 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 ` 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 ` Boris Brezillon 2016-06-14 9:13 ` 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 ` Boris Brezillon 2016-06-14 9:13 ` 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 ` Boris Brezillon 2016-06-14 9:13 ` 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 ` Boris Brezillon 2016-06-14 9:13 ` 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 ` Boris Brezillon 2016-06-14 9:13 ` 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 ` Boris Brezillon 2016-06-14 9:13 ` 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 ` 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 ` Boris Brezillon 2016-06-14 9:13 ` 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 ` Boris Brezillon 2016-06-14 9:13 ` Boris Brezillon 2016-06-14 9:13 ` [PATCH v3 10/14] regulator: pwm: Switch to the atomic PWM API Boris Brezillon 2016-06-14 9:13 ` Boris Brezillon 2016-06-14 9:13 ` Boris Brezillon 2016-07-05 14:30 ` Mark Brown 2016-07-05 14:30 ` Mark Brown 2016-06-14 9:13 ` Boris Brezillon [this message] 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-07-05 14:31 ` Mark Brown 2016-07-05 14:31 ` Mark Brown 2016-06-14 9:13 ` [PATCH v3 12/14] regulator: pwm: Retrieve correct voltage Boris Brezillon 2016-06-14 9:13 ` Boris Brezillon 2016-07-05 14:32 ` Mark Brown 2016-07-05 14:32 ` Mark Brown 2016-07-08 15:43 ` Thierry Reding 2016-07-08 15:43 ` Thierry Reding 2016-07-09 9:47 ` Mark Brown 2016-07-09 9:47 ` Mark Brown 2016-07-09 9:47 ` Mark Brown 2016-07-11 7:02 ` Thierry Reding 2016-07-11 7:02 ` Thierry Reding 2016-07-11 7:20 ` Boris Brezillon 2016-07-11 7:20 ` Boris Brezillon 2016-07-11 16:53 ` Doug Anderson 2016-07-11 16:53 ` Doug Anderson 2016-07-11 16:53 ` Doug Anderson 2016-06-14 9:13 ` [PATCH v3 13/14] regulator: pwm: Support extra continuous mode cases Boris Brezillon 2016-06-14 9:13 ` Boris Brezillon 2016-07-05 14:34 ` Mark Brown 2016-07-05 14:34 ` Mark Brown 2016-07-05 14:34 ` 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-14 9:13 ` Boris Brezillon 2016-06-14 9:13 ` Boris Brezillon 2016-06-16 22:26 ` Rob Herring 2016-06-16 22:26 ` Rob Herring 2016-07-05 14:36 ` Mark Brown 2016-07-05 14:36 ` Mark Brown 2016-07-08 16:35 ` [PATCH v3 00/14] regulator: pwm: various improvements Thierry Reding 2016-07-08 16:35 ` 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-12-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.