From: Rodrigo Rolim Mendes de Alencar <455.rodrigo.alencar@gmail.com>
To: linux-fbdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, maxime.ripard@free-electrons.com,
alencar.fmce@imbel.gov.br
Subject: [PATCH 3/3] video: fbdev: ssd1307fb: Switch to atomic PWM API
Date: Tue, 12 May 2020 17:52:49 -0300 [thread overview]
Message-ID: <1589316769-13277-3-git-send-email-alencar.fmce@imbel.gov.br> (raw)
In-Reply-To: <1589316769-13277-1-git-send-email-alencar.fmce@imbel.gov.br>
Signed-off-by: Rodrigo Rolim Mendes de Alencar <alencar.fmce@imbel.gov.br>
---
drivers/video/fbdev/ssd1307fb.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/video/fbdev/ssd1307fb.c b/drivers/video/fbdev/ssd1307fb.c
index 748c21c0567b..b1cac4a3722f 100644
--- a/drivers/video/fbdev/ssd1307fb.c
+++ b/drivers/video/fbdev/ssd1307fb.c
@@ -303,7 +303,7 @@ static int ssd1307fb_init(struct ssd1307fb_par *par)
{
int ret;
u32 precharge, dclk, com_invdir, compins;
- struct pwm_args pargs;
+ struct pwm_state pstate;
if (par->device_info->need_pwm) {
par->pwm = pwm_get(&par->client->dev, NULL);
@@ -312,18 +312,18 @@ static int ssd1307fb_init(struct ssd1307fb_par *par)
return PTR_ERR(par->pwm);
}
- /*
- * FIXME: pwm_apply_args() should be removed when switching to
- * the atomic PWM API.
- */
- pwm_apply_args(par->pwm);
+ pwm_init_state(par->pwm, &pstate);
+ par->pwm_period = pstate.period;
- pwm_get_args(par->pwm, &pargs);
-
- par->pwm_period = pargs.period;
/* Enable the PWM */
- pwm_config(par->pwm, par->pwm_period / 2, par->pwm_period);
- pwm_enable(par->pwm);
+ pstate.enabled = true;
+ pstate.duty_cycle = pstate.period / 2;
+
+ ret = pwm_apply_state(par->pwm, &pstate);
+ if (ret) {
+ dev_err(&par->client->dev, "Failed to apply PWM state: %d\n", ret);
+ return ret;
+ }
dev_dbg(&par->client->dev, "Using PWM%d with a %dns period.\n",
par->pwm->pwm, par->pwm_period);
--
2.23.0.rc1
next prev parent reply other threads:[~2020-05-12 20:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-12 20:52 [PATCH 1/3] video: fbdev: ssd1307fb: Added support to Column offset Rodrigo Rolim Mendes de Alencar
2020-05-12 20:52 ` [PATCH 2/3] video: fbdev: ssd1307fb: Support to pixel inversion Rodrigo Rolim Mendes de Alencar
2020-05-13 7:09 ` Geert Uytterhoeven
2020-05-12 20:52 ` Rodrigo Rolim Mendes de Alencar [this message]
2020-05-12 20:59 ` [PATCH 1/3] video: fbdev: ssd1307fb: Added support to Column offset Andy Shevchenko
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=1589316769-13277-3-git-send-email-alencar.fmce@imbel.gov.br \
--to=455.rodrigo.alencar@gmail.com \
--cc=alencar.fmce@imbel.gov.br \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maxime.ripard@free-electrons.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).