From patchwork Fri Dec 7 08:29:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Shimoda X-Patchwork-Id: 10717623 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ACE0E1750 for ; Fri, 7 Dec 2018 08:32:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9EB512E830 for ; Fri, 7 Dec 2018 08:32:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 92D072E838; Fri, 7 Dec 2018 08:32:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 27DDB2E846 for ; Fri, 7 Dec 2018 08:32:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725997AbeLGIcC (ORCPT ); Fri, 7 Dec 2018 03:32:02 -0500 Received: from relmlor2.renesas.com ([210.160.252.172]:61244 "EHLO relmlie6.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725985AbeLGIcC (ORCPT ); Fri, 7 Dec 2018 03:32:02 -0500 X-IronPort-AV: E=Sophos;i="5.56,324,1539615600"; d="scan'208";a="2005525" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 07 Dec 2018 17:32:00 +0900 Received: from localhost.localdomain (unknown [10.166.17.210]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 417794A77D2F; Fri, 7 Dec 2018 17:32:00 +0900 (JST) From: Yoshihiro Shimoda To: thierry.reding@gmail.com Cc: linux-pwm@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Yoshihiro Shimoda Subject: [PATCH 1/5] pwm: rcar: add rcar_pwm_calc_counter() to calculate PWMCNT value only Date: Fri, 7 Dec 2018 17:29:29 +0900 Message-Id: <1544171373-29618-2-git-send-email-yoshihiro.shimoda.uh@renesas.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1544171373-29618-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> References: <1544171373-29618-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP To add a workaround in the future, this patch adds a function rcar_pwm_calc_counter() from rcar_pwm_set_counter(). The rcar_pwm_calc_counter() calculates PWMCNT value only, and rcar_pwm_set_counter() set the PWMCNT register by using the calculated value. No change in behavior. Signed-off-by: Yoshihiro Shimoda --- drivers/pwm/pwm-rcar.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/pwm/pwm-rcar.c b/drivers/pwm/pwm-rcar.c index a41812f..9cf4567 100644 --- a/drivers/pwm/pwm-rcar.c +++ b/drivers/pwm/pwm-rcar.c @@ -36,6 +36,7 @@ struct rcar_pwm_chip { struct pwm_chip chip; void __iomem *base; struct clk *clk; + u32 pwmcnt; }; static inline struct rcar_pwm_chip *to_rcar_pwm_chip(struct pwm_chip *chip) @@ -102,8 +103,8 @@ static void rcar_pwm_set_clock_control(struct rcar_pwm_chip *rp, rcar_pwm_write(rp, value, RCAR_PWMCR); } -static int rcar_pwm_set_counter(struct rcar_pwm_chip *rp, int div, int duty_ns, - int period_ns) +static void rcar_pwm_calc_counter(struct rcar_pwm_chip *rp, int div, + int duty_ns, int period_ns) { unsigned long long one_cycle, tmp; /* 0.01 nanoseconds */ unsigned long clk_rate = clk_get_rate(rp->clk); @@ -120,11 +121,17 @@ static int rcar_pwm_set_counter(struct rcar_pwm_chip *rp, int div, int duty_ns, do_div(tmp, one_cycle); ph = tmp & RCAR_PWMCNT_PH0_MASK; + rp->pwmcnt = cyc | ph; +} + +static int rcar_pwm_set_counter(struct rcar_pwm_chip *rp) +{ /* Avoid prohibited setting */ - if (cyc == 0 || ph == 0) + if ((rp->pwmcnt & RCAR_PWMCNT_CYC0_MASK) == 0 || + (rp->pwmcnt & RCAR_PWMCNT_PH0_MASK) == 0) return -EINVAL; - rcar_pwm_write(rp, cyc | ph, RCAR_PWMCNT); + rcar_pwm_write(rp, rp->pwmcnt, RCAR_PWMCNT); return 0; } @@ -159,7 +166,8 @@ static int rcar_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, rcar_pwm_update(rp, RCAR_PWMCR_SYNC, RCAR_PWMCR_SYNC, RCAR_PWMCR); - ret = rcar_pwm_set_counter(rp, div, duty_ns, period_ns); + rcar_pwm_calc_counter(rp, div, duty_ns, period_ns); + ret = rcar_pwm_set_counter(rp); if (!ret) rcar_pwm_set_clock_control(rp, div);