From patchwork Wed Mar 30 20:04:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris BREZILLON X-Patchwork-Id: 8706521 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CB4DAC0553 for ; Thu, 31 Mar 2016 00:50:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0377820383 for ; Thu, 31 Mar 2016 00:50:13 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 294E120374 for ; Thu, 31 Mar 2016 00:50:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B263A6E947; Thu, 31 Mar 2016 00:49:42 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail.free-electrons.com (down.free-electrons.com [37.187.137.238]) by gabe.freedesktop.org (Postfix) with ESMTP id 7C4C36E8A1; Wed, 30 Mar 2016 20:06:15 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id 394601CC1; Wed, 30 Mar 2016 22:06:14 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from localhost.localdomain (LFbn-1-2159-240.w90-76.abo.wanadoo.fr [90.76.216.240]) by mail.free-electrons.com (Postfix) with ESMTPSA id 74ECB1BB6; Wed, 30 Mar 2016 22:05:35 +0200 (CEST) From: Boris Brezillon To: Thierry Reding , linux-pwm@vger.kernel.org Subject: [PATCH v5 44/46] video: ssd1307fb: switch to the atomic PWM API Date: Wed, 30 Mar 2016 22:04:07 +0200 Message-Id: <1459368249-13241-45-git-send-email-boris.brezillon@free-electrons.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1459368249-13241-1-git-send-email-boris.brezillon@free-electrons.com> References: <1459368249-13241-1-git-send-email-boris.brezillon@free-electrons.com> X-Mailman-Approved-At: Thu, 31 Mar 2016 00:47:57 +0000 Cc: Milo Kim , Kamil Debski , linux-doc@vger.kernel.org, Mike Turquette , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com, Alexandre Belloni , Daniel Vetter , Lee Jones , linux-clk@vger.kernel.org, linux-leds@vger.kernel.org, Krzysztof Kozlowski , linux-samsung-soc@vger.kernel.org, Alexander Shiyan , Jonathan Corbet , Robert Jarzmik , lm-sensors@lm-sensors.org, linux-rockchip@lists.infradead.org, Chen-Yu Tsai , Tomi Valkeinen , linux-input@vger.kernel.org, Jean-Christophe Plagniol-Villard , intel-gfx@lists.freedesktop.org, Guenter Roeck , Jean Delvare , Joachim Eastwood , Bryan Wu , Mark Brown , Jacek Anaszewski , linux-arm-kernel@lists.infradead.org, Thomas Petazzoni , Ryan Mallon , Jingoo Han , Dmitry Torokhov , Stephen Boyd , Liam Girdwood , Hartley Sweeten , Richard Purdie , Kukjin Kim , Maxime Ripard X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP pwm_config/enable/disable() have been deprecated and should be replaced by pwm_apply_state(). Signed-off-by: Boris Brezillon --- 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);