[PATCH v5 44/46] video: ssd1307fb: switch to the atomic PWM API

[Boris Brezillon]

pwm_config/enable/disable() have been deprecated and should be replaced
by pwm_apply_state().

Signed-off-by: Boris Brezillon <boris.brezillon at free-electrons.com>
---
 drivers/video/fbdev/ssd1307fb.c | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/drivers/video/fbdev/ssd1307fb.c b/drivers/video/fbdev/ssd1307fb.c
index df9c63a..ed9a115 100644
--- a/drivers/video/fbdev/ssd1307fb.c
+++ b/drivers/video/fbdev/ssd1307fb.c
@@ -289,6 +289,8 @@ static int ssd1307fb_init(struct ssd1307fb_par *par)
 	struct pwm_args pargs = { };
 
 	if (par->device_info->need_pwm) {
+		struct pwm_state pstate;
+
 		par->pwm = pwm_get(&par->client->dev, NULL);
 		if (IS_ERR(par->pwm)) {
 			dev_err(&par->client->dev, "Could not get PWM from device tree!\n");
@@ -296,10 +298,14 @@ static int ssd1307fb_init(struct ssd1307fb_par *par)
 		}
 
 		pwm_get_args(par->pwm, &pargs);
+		pwm_get_state(par->pwm, &pstate);
 		par->pwm_period = pargs.period;
+
 		/* Enable the PWM */
-		pwm_config(par->pwm, par->pwm_period / 2, par->pwm_period);
-		pwm_enable(par->pwm);
+		pstate.period = pargs.period;
+		pstate.duty_cycle = pstate.period / 2;
+		pstate.enabled = true;
+		pwm_apply_state(par->pwm, &pstate);
 
 		dev_dbg(&par->client->dev, "Using PWM%d with a %dns period.\n",
 			par->pwm->pwm, par->pwm_period);
@@ -685,8 +691,12 @@ static int ssd1307fb_probe(struct i2c_client *client,
 bl_init_error:
 	unregister_framebuffer(info);
 panel_init_error:
-	if (par->device_info->need_pwm) {
-		pwm_disable(par->pwm);
+	if (par->device_info->need_pwm && par->pwm) {
+		struct pwm_state pstate;
+
+		pwm_get_state(par->pwm, &pstate);
+		pstate.enabled = false;
+		pwm_apply_state(par->pwm, &pstate);
 		pwm_put(par->pwm);
 	};
 reset_oled_error:
@@ -707,7 +717,11 @@ static int ssd1307fb_remove(struct i2c_client *client)
 
 	unregister_framebuffer(info);
 	if (par->device_info->need_pwm) {
-		pwm_disable(par->pwm);
+		struct pwm_state pstate;
+
+		pwm_get_state(par->pwm, &pstate);
+		pstate.enabled = false;
+		pwm_apply_state(par->pwm, &pstate);
 		pwm_put(par->pwm);
 	};
 	fb_deferred_io_cleanup(info);
-- 
2.5.0