From: Artur Weber <aweber.kernel@gmail.com>
To: Lee Jones <lee@kernel.org>, Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
Cc: linux-arm-msm@vger.kernel.org, "Luca Weiss" <luca@z3ntu.xyz>,
"Daniel Thompson" <daniel.thompson@linaro.org>,
"Artur Weber" <aweber.kernel@gmail.com>,
devicetree@vger.kernel.org, "Jingoo Han" <jingoohan1@gmail.com>,
"Bjorn Andersson" <andersson@kernel.org>,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
"Jonathan Hunter" <jonathanh@nvidia.com>,
"Konrad Dybcio" <konrad.dybcio@linaro.org>,
linux-fbdev@vger.kernel.org, "Andy Gross" <agross@kernel.org>,
"Thierry Reding" <thierry.reding@gmail.com>,
~postmarketos/upstreaming@lists.sr.ht,
"Pavel Machek" <pavel@ucw.cz>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
linux-tegra@vger.kernel.org, linux-pwm@vger.kernel.org,
"Helge Deller" <deller@gmx.de>,
linux-leds@vger.kernel.org
Subject: [PATCH v2 2/4] video: backlight: lp855x: get PWM for PWM mode during probe
Date: Fri, 19 May 2023 20:07:26 +0200 [thread overview]
Message-ID: <20230519180728.2281-3-aweber.kernel@gmail.com> (raw)
In-Reply-To: <20230519180728.2281-1-aweber.kernel@gmail.com>
Also deprecate the pwm-period DT property, as it is now redundant
(pwms property already contains period value).
Signed-off-by: Artur Weber <aweber.kernel@gmail.com>
---
drivers/video/backlight/lp855x_bl.c | 48 ++++++++++++++++-------------
1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/drivers/video/backlight/lp855x_bl.c b/drivers/video/backlight/lp855x_bl.c
index a57c9ef3b1cc..0ef850dd8e84 100644
--- a/drivers/video/backlight/lp855x_bl.c
+++ b/drivers/video/backlight/lp855x_bl.c
@@ -218,23 +218,10 @@ static int lp855x_configure(struct lp855x *lp)
static void lp855x_pwm_ctrl(struct lp855x *lp, int br, int max_br)
{
- struct pwm_device *pwm;
struct pwm_state state;
- /* request pwm device with the consumer name */
- if (!lp->pwm) {
- pwm = devm_pwm_get(lp->dev, lp->chipname);
- if (IS_ERR(pwm))
- return;
-
- lp->pwm = pwm;
-
- pwm_init_state(lp->pwm, &state);
- } else {
- pwm_get_state(lp->pwm, &state);
- }
+ pwm_get_state(lp->pwm, &state);
- state.period = lp->pdata->period_ns;
state.duty_cycle = div_u64(br * state.period, max_br);
state.enabled = state.duty_cycle;
@@ -339,6 +326,7 @@ static int lp855x_parse_dt(struct lp855x *lp)
of_property_read_string(node, "bl-name", &pdata->name);
of_property_read_u8(node, "dev-ctrl", &pdata->device_control);
of_property_read_u8(node, "init-brt", &pdata->initial_brightness);
+ /* Deprecated, specify period in pwms property instead */
of_property_read_u32(node, "pwm-period", &pdata->period_ns);
/* Fill ROM platform data if defined */
@@ -399,6 +387,7 @@ static int lp855x_probe(struct i2c_client *cl)
const struct i2c_device_id *id = i2c_client_get_device_id(cl);
const struct acpi_device_id *acpi_id = NULL;
struct device *dev = &cl->dev;
+ struct pwm_state pwmstate;
struct lp855x *lp;
int ret;
@@ -457,11 +446,6 @@ static int lp855x_probe(struct i2c_client *cl)
}
}
- if (lp->pdata->period_ns > 0)
- lp->mode = PWM_BASED;
- else
- lp->mode = REGISTER_BASED;
-
lp->supply = devm_regulator_get(dev, "power");
if (IS_ERR(lp->supply)) {
if (PTR_ERR(lp->supply) == -EPROBE_DEFER)
@@ -472,11 +456,31 @@ static int lp855x_probe(struct i2c_client *cl)
lp->enable = devm_regulator_get_optional(dev, "enable");
if (IS_ERR(lp->enable)) {
ret = PTR_ERR(lp->enable);
- if (ret == -ENODEV) {
+ if (ret == -ENODEV)
lp->enable = NULL;
- } else {
+ else
return dev_err_probe(dev, ret, "getting enable regulator\n");
- }
+ }
+
+ lp->pwm = devm_pwm_get(lp->dev, lp->chipname);
+ if (IS_ERR(lp->pwm)) {
+ ret = PTR_ERR(lp->pwm);
+ if (ret == -ENODEV || ret == -EINVAL)
+ lp->pwm = NULL;
+ else
+ return dev_err_probe(dev, ret, "getting PWM\n");
+
+ lp->mode = REGISTER_BASED;
+ dev_dbg(dev, "mode: register based\n");
+ } else {
+ pwm_init_state(lp->pwm, &pwmstate);
+ /* Legacy platform data compatibility */
+ if (lp->pdata->period_ns > 0)
+ pwmstate.period = lp->pdata->period_ns;
+ pwm_apply_state(lp->pwm, &pwmstate);
+
+ lp->mode = PWM_BASED;
+ dev_dbg(dev, "mode: PWM based\n");
}
if (lp->supply) {
--
2.40.1
next prev parent reply other threads:[~2023-05-19 18:09 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-19 18:07 [PATCH v2 0/4] video: backlight: lp855x: modernize bindings Artur Weber
2023-05-19 18:07 ` [PATCH v2 1/4] dt-bindings: backlight: lp855x: convert to YAML and modernize Artur Weber
2023-05-26 10:35 ` Daniel Thompson
2023-06-08 15:46 ` Lee Jones
2023-05-19 18:07 ` Artur Weber [this message]
2023-05-26 10:38 ` [PATCH v2 2/4] video: backlight: lp855x: get PWM for PWM mode during probe Daniel Thompson
2023-06-08 15:50 ` Lee Jones
2023-05-19 18:07 ` [PATCH v2 3/4] ARM: dts: adapt to LP855X bindings changes Artur Weber
2023-05-26 10:39 ` Daniel Thompson
2023-05-19 18:07 ` [PATCH v2 4/4] arm64: " Artur Weber
2023-05-26 10:39 ` Daniel Thompson
2023-06-13 22:30 ` (subset) [PATCH v2 0/4] video: backlight: lp855x: modernize bindings Bjorn Andersson
2023-06-15 16:41 ` Bjorn Andersson
2023-07-21 15:33 ` 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=20230519180728.2281-3-aweber.kernel@gmail.com \
--to=aweber.kernel@gmail.com \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=daniel.thompson@linaro.org \
--cc=deller@gmx.de \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=jingoohan1@gmail.com \
--cc=jonathanh@nvidia.com \
--cc=konrad.dybcio@linaro.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=lee@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=luca@z3ntu.xyz \
--cc=pavel@ucw.cz \
--cc=robh+dt@kernel.org \
--cc=thierry.reding@gmail.com \
--cc=u.kleine-koenig@pengutronix.de \
--cc=~postmarketos/upstreaming@lists.sr.ht \
/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).