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: 8704611 Return-Path: X-Original-To: patchwork-linux-arm@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 793B6C0553 for ; Wed, 30 Mar 2016 20:20:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AA667201EF for ; Wed, 30 Mar 2016 20:20:07 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D04ED20160 for ; Wed, 30 Mar 2016 20:20:06 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1alMZV-0004IW-ND; Wed, 30 Mar 2016 20:18:33 +0000 Received: from down.free-electrons.com ([37.187.137.238] helo=mail.free-electrons.com) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1alMNt-0006ep-QW; Wed, 30 Mar 2016 20:06:37 +0000 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160330_130634_661371_7BEC03D2 X-CRM114-Status: GOOD ( 14.10 ) X-Spam-Score: -2.9 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Milo Kim , Kamil Debski , Heiko Stuebner , linux-doc@vger.kernel.org, David Airlie , 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, Boris Brezillon , 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 , Jani Nikula , 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 , Daniel Vetter , Maxime Ripard MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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);