Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755673AbcC3UKL (ORCPT ); Wed, 30 Mar 2016 16:10:11 -0400 Received: from down.free-electrons.com ([37.187.137.238]:45670 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753356AbcC3UFp (ORCPT ); Wed, 30 Mar 2016 16:05:45 -0400 From: Boris Brezillon To: Thierry Reding , linux-pwm@vger.kernel.org Cc: Mike Turquette , Stephen Boyd , linux-clk@vger.kernel.org, Mark Brown , Liam Girdwood , Kamil Debski , lm-sensors@lm-sensors.org, Jean Delvare , Guenter Roeck , Dmitry Torokhov , linux-input@vger.kernel.org, Bryan Wu , Richard Purdie , Jacek Anaszewski , linux-leds@vger.kernel.org, Maxime Ripard , Chen-Yu Tsai , linux-sunxi@googlegroups.com, Joachim Eastwood , Thomas Petazzoni , Heiko Stuebner , linux-rockchip@lists.infradead.org, Jingoo Han , Lee Jones , linux-fbdev@vger.kernel.org, Jean-Christophe Plagniol-Villard , Tomi Valkeinen , Robert Jarzmik , Alexandre Belloni , Kukjin Kim , Krzysztof Kozlowski , linux-samsung-soc@vger.kernel.org, intel-gfx@lists.freedesktop.org, Daniel Vetter , Jani Nikula , Jonathan Corbet , linux-doc@vger.kernel.org, David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Hartley Sweeten , Ryan Mallon , Alexander Shiyan , Milo Kim , Boris Brezillon Subject: [PATCH v5 34/46] clk: pwm: switch to the atomic API Date: Wed, 30 Mar 2016 22:03:57 +0200 Message-Id: <1459368249-13241-35-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> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1857 Lines: 68 pwm_config/enable/disable() have been deprecated and should be replaced by pwm_apply_state(). Signed-off-by: Boris Brezillon --- drivers/clk/clk-pwm.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/drivers/clk/clk-pwm.c b/drivers/clk/clk-pwm.c index ebcd738..49ec5b1 100644 --- a/drivers/clk/clk-pwm.c +++ b/drivers/clk/clk-pwm.c @@ -28,15 +28,29 @@ static inline struct clk_pwm *to_clk_pwm(struct clk_hw *hw) static int clk_pwm_prepare(struct clk_hw *hw) { struct clk_pwm *clk_pwm = to_clk_pwm(hw); + struct pwm_state pstate; - return pwm_enable(clk_pwm->pwm); + pwm_get_state(clk_pwm->pwm, &pstate); + if (pstate.enabled) + return 0; + + pstate.enabled = true; + + return pwm_apply_state(clk_pwm->pwm, &pstate); } static void clk_pwm_unprepare(struct clk_hw *hw) { struct clk_pwm *clk_pwm = to_clk_pwm(hw); + struct pwm_state pstate; + + pwm_get_state(clk_pwm->pwm, &pstate); + if (!pstate.enabled) + return; - pwm_disable(clk_pwm->pwm); + pstate.enabled = false; + + pwm_apply_state(clk_pwm->pwm, &pstate); } static unsigned long clk_pwm_recalc_rate(struct clk_hw *hw, @@ -56,6 +70,7 @@ static const struct clk_ops clk_pwm_ops = { static int clk_pwm_probe(struct platform_device *pdev) { struct device_node *node = pdev->dev.of_node; + struct pwm_state pstate; struct pwm_args pargs = { }; struct clk_init_data init; struct clk_pwm *clk_pwm; @@ -88,7 +103,12 @@ static int clk_pwm_probe(struct platform_device *pdev) return -EINVAL; } - ret = pwm_config(pwm, (pargs.period + 1) >> 1, pargs.period); + pwm_get_state(pwm, &pstate); + pstate.period = pargs.period; + pstate.polarity = pargs.polarity; + pstate.duty_cycle = (pargs.period + 1) >> 1; + + ret = pwm_apply_state(pwm, &pstate); if (ret < 0) return ret; -- 2.5.0