From patchwork Sat Nov 28 12:02:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lino Sanfilippo X-Patchwork-Id: 1407660 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-pwm-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=gFbNIdOw; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Ck5Dh711Qz9sVN for ; Sun, 29 Nov 2020 09:06:28 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726865AbgK1VuW (ORCPT ); Sat, 28 Nov 2020 16:50:22 -0500 Received: from mout.gmx.net ([212.227.17.21]:39991 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729523AbgK1S1m (ORCPT ); Sat, 28 Nov 2020 13:27:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1606587970; bh=fTNcahD5C5mIibbD0BONpKqc5JTcNDDIjg8VN6MVM/A=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=gFbNIdOwltij+vHFkKwdItVku53ydIOJPgOeJ6PTFhl6VGuEqBPewC87VsbCi/A8t n+4pPdJCVagLfbhnGTo6Eji5+4Po7ujwPOtxSy3yI6bRXH/JGReXhYovp+qtcOAj+D zUEgBW5WDwD+ao6Vfo7FpOc95jCT9NxskkyCo77M= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from Venus.fritz.box ([78.42.220.31]) by mail.gmx.com (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MTzb8-1kZfWP46l8-00R1QV; Sat, 28 Nov 2020 13:02:16 +0100 From: Lino Sanfilippo To: thierry.reding@gmail.com Cc: u.kleine-koenig@pengutronix.de, lee.jones@linaro.org, nsaenzjulienne@suse.de, f.fainelli@gmail.com, rjui@broadcom.com, sbranden@broadcom.com, bcm-kernel-feedback-list@broadcom.com, linux-pwm@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Lino Sanfilippo Subject: [PATCH v2] pwm: bcm2835: Support apply function for atomic configuration Date: Sat, 28 Nov 2020 13:02:06 +0100 Message-Id: <1606564926-19555-1-git-send-email-LinoSanfilippo@gmx.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <202011281128.54eLfMWr-lkp@intel.com> References: <202011281128.54eLfMWr-lkp@intel.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:og7aglZ3Q+zHmb8EXfjZyCFzh8Ae5o38SlBuTifQqzoXN2JffJR dqmvC5FywZBF4ubQoLkvsXZqbPjAbEKapFnoupSXKXcTlHvuAXXUvjmQ8pqiV4mL3WqHjF1 oXE5JpJErxtKwPFphUY1y30bdXGMo/vd6Eo2oGUcG/WKGGwPLkhMNEHw3bZSSTWk7gEJEqs HHdyD/AJTIR5Ql0alVb7g== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:ryDjOyhw8zQ=:W/pMlI3oC5HBuQaB/Nt6zX 8Gky4dp6vUJmx4ZgSagIn4kTBT1sFV5oWBjzHOSNTLUZlCkjUudWR4OKOyGyu2GSvLhrPGg3/ CAWw0YVP4SXUuIgxeNJf21PUg5qrShmeXcCXiDCH0IzJGimhtIttnbE0PgyCgCba4so5gthq5 xSykNEJ0q3cdg9werMu+EXRoZJcz1dW7uaBcJ2cmIRKSkP1r/KU53dVFdQXJyNgroFy8/1HAt Ef2/GHrkzOUqs8c1CzLiSy1UDpfZm5fGZizwXH6uqCCTXdzzc7VoP5DbbWk1HQlik/+EeY1ht j0HuCvyxnosGv7Z0mMILDAQ5/Rb3yjctGfWPgbG0IdFi+2XluMDVhXpQ+G1D7BeDd9UFYNSW+ y6v/Yv6fT2YIy3suYFyr8lLsQyMXF7/0noS179HVH2Cx2U+wWqfi9lnMX9tyjFXw4LSZoNrA2 KipLi70jcjUnoXiZ1HWo8qhRUijM9mQr9SCxiFbPPyMeWKospK2mvjbD+pbONoIpgGKK71VfR BNqivL1nw3xkmIPFR/3p5wmV+ly3nuJzM/+fqSg0PSXjokgofNuj+KI4c7hQ8Fc+MTgWLd1Th cJ7wfzpbKsgTLEaopgyuYEvL5Kppaq59rFv3hmIiYs7uyu7rMYw3INfNuTFzcVmXoflpJTw3A NtkSseHQ0FzEaq7C3Cc4aE19QFhJT/Ee3Ym/gCe/MmMnEGzrYiWBePyY9KmRs+kUVaqYiHXOV 0yD8LLvSYM8oDYWE2bc9hZ/+JCooFcNreOJ09KNDvs42BGH/UqqzRse38mzEq1E3K9ErkxSd7 G4sjKQns+yslosXtPIhScHtrMV4n76ZRUG1srMBshbfj1r+B/N5dgvWGKeArSz2He0RryIeg4 cWETfO4CHeyA2Wnr6CJA== Precedence: bulk List-ID: X-Mailing-List: linux-pwm@vger.kernel.org Use the newer apply function of pwm_ops instead of config, enable, disable and set_polarity. This guarantees atomic changes of the pwm controller configuration. It also reduces the size of the driver. This has been tested on a Raspberry PI 4. v2: Fixed compiler error Signed-off-by: Lino Sanfilippo --- drivers/pwm/pwm-bcm2835.c | 64 ++++++++++++++++------------------------------- 1 file changed, 21 insertions(+), 43 deletions(-) diff --git a/drivers/pwm/pwm-bcm2835.c b/drivers/pwm/pwm-bcm2835.c index 6841dcf..dad7443 100644 --- a/drivers/pwm/pwm-bcm2835.c +++ b/drivers/pwm/pwm-bcm2835.c @@ -58,13 +58,14 @@ static void bcm2835_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm) writel(value, pc->base + PWM_CONTROL); } -static int bcm2835_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, - int duty_ns, int period_ns) +static int bcm2835_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, + const struct pwm_state *state) { + struct bcm2835_pwm *pc = to_bcm2835_pwm(chip); unsigned long rate = clk_get_rate(pc->clk); unsigned long scaler; - u32 period; + u32 value; if (!rate) { dev_err(pc->dev, "failed to get clock rate\n"); @@ -72,65 +73,42 @@ static int bcm2835_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, } scaler = DIV_ROUND_CLOSEST(NSEC_PER_SEC, rate); - period = DIV_ROUND_CLOSEST(period_ns, scaler); + /* set period */ + value = DIV_ROUND_CLOSEST_ULL(state->period, scaler); - if (period < PERIOD_MIN) + if (value < PERIOD_MIN) return -EINVAL; - writel(DIV_ROUND_CLOSEST(duty_ns, scaler), - pc->base + DUTY(pwm->hwpwm)); - writel(period, pc->base + PERIOD(pwm->hwpwm)); - - return 0; -} + writel(value, pc->base + PERIOD(pwm->hwpwm)); -static int bcm2835_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm) -{ - struct bcm2835_pwm *pc = to_bcm2835_pwm(chip); - u32 value; + /* set duty cycle */ + value = DIV_ROUND_CLOSEST_ULL(state->duty_cycle, scaler); + writel(value, pc->base + DUTY(pwm->hwpwm)); + /* set polarity */ value = readl(pc->base + PWM_CONTROL); - value |= PWM_ENABLE << PWM_CONTROL_SHIFT(pwm->hwpwm); - writel(value, pc->base + PWM_CONTROL); - - return 0; -} -static void bcm2835_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm) -{ - struct bcm2835_pwm *pc = to_bcm2835_pwm(chip); - u32 value; - - value = readl(pc->base + PWM_CONTROL); - value &= ~(PWM_ENABLE << PWM_CONTROL_SHIFT(pwm->hwpwm)); - writel(value, pc->base + PWM_CONTROL); -} - -static int bcm2835_set_polarity(struct pwm_chip *chip, struct pwm_device *pwm, - enum pwm_polarity polarity) -{ - struct bcm2835_pwm *pc = to_bcm2835_pwm(chip); - u32 value; - - value = readl(pc->base + PWM_CONTROL); - - if (polarity == PWM_POLARITY_NORMAL) + if (state->polarity == PWM_POLARITY_NORMAL) value &= ~(PWM_POLARITY << PWM_CONTROL_SHIFT(pwm->hwpwm)); else value |= PWM_POLARITY << PWM_CONTROL_SHIFT(pwm->hwpwm); + /* enable/disable */ + if (state->enabled) + value |= PWM_ENABLE << PWM_CONTROL_SHIFT(pwm->hwpwm); + else + value &= ~(PWM_ENABLE << PWM_CONTROL_SHIFT(pwm->hwpwm)); + writel(value, pc->base + PWM_CONTROL); return 0; } + static const struct pwm_ops bcm2835_pwm_ops = { .request = bcm2835_pwm_request, .free = bcm2835_pwm_free, - .config = bcm2835_pwm_config, - .enable = bcm2835_pwm_enable, - .disable = bcm2835_pwm_disable, - .set_polarity = bcm2835_set_polarity, + .apply = bcm2835_pwm_apply, .owner = THIS_MODULE, };