From patchwork Sat Nov 28 00:55:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lino Sanfilippo X-Patchwork-Id: 1407440 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=RZh0tbC7; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CjY4x0LJYz9s0b for ; Sat, 28 Nov 2020 11:57:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731113AbgK1A5T (ORCPT ); Fri, 27 Nov 2020 19:57:19 -0500 Received: from mout.gmx.net ([212.227.15.15]:44957 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732191AbgK1A4t (ORCPT ); Fri, 27 Nov 2020 19:56:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1606524989; bh=ZzHUIAcJkfQ4yMJ+3D8uhEGiaG82a6I1rM1VddR6Ljk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=RZh0tbC7BlG0urshsTaRhgFxZFwJwAE99KQ9gqlTWfS07OvuIide2+xUBup1eB/bA 493XIIWAPsKeAB5nplcU0KoaAKszBiRb2uSqx+omZNsDKoS3BKQyqXMgBk+XZQXk8c 4L2z4x0YlwL2o9Yb3H78x+ST82kV8ZqwYZOVootA= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from Venus.fritz.box ([78.42.220.31]) by mail.gmx.com (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1Mlf0K-1kInRX2KxO-00igwL; Sat, 28 Nov 2020 01:56:29 +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] pwm: bcm2835: Support apply function for atomic configuration Date: Sat, 28 Nov 2020 01:55:12 +0100 Message-Id: <1606524912-16683-1-git-send-email-LinoSanfilippo@gmx.de> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Provags-ID: V03:K1:jdfU7DsUEvhMkWh8Prv5e4yo2mrgbndU0LflzdY48Lv5rZPE6cJ 2s7lKs5atD/6eozd9PQDBiPuGTV4mKVTsRsEMM9JxYr6tEW9Xii7Y1QmBIk+I40LvULPejH SFVQbnUguaqaAR125/XzqnmsPGnGYN50LM2f9iiu9oF8WA7CGbL+uRCVLgbOw2SJWQUCLxI eCXXmAo6KONu6luLslK7g== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:ymX10MsVhas=:Cgj/yIxRX4k6/e+KKr3Usp Kr4vbvRCOFUnGClJOdcte3iAemlH+Iqud0V54Lss0U0+qgFEY+/ZLxDfREvOGyI0qf68cFOob piVdq0acfdCkNpVIfrPbDZFRzMRyX2K/no499Vt0x0P06L7pyb0C2WhZWmXXASo75Af5PTgeJ 7yKUL0QzR91fWo/3nUOqpACAFdtBjhevk90LLnZ2RW6zp+JZLZe42L9y3fB3Dv4Fmx1GNu6JP I9kR61MfvLCBr5r+jlFfU7vCkr7r1NXkfY0gvQmVOCDXWwMPcBHMXh4ORAuUo/9tlJUGhhcT9 qmCzrUZn/ead1d6VvwE2XZG1Pj4TQwpPGktwBBbSx/e8DjL92KCsxW54QF7rAXBWQNXObG1qH HhccDMOgtt45sgCZzUrNFdNVK7Iu9QfoZgDBD9jMSg0JV5hQlCg7F3Z+EtNpYWVqQOob4VW44 5D56CGmYAcjSa5YTClTvh46MkATqQYXo7UncBjMR4muQCSDg+PdcEZsfG25XCakVJc2H/GTjr giCvkqgiBXpnPXN8xExo/qccE+oMHXYV1AzY8opT41YSDy6qn3RvrWAHyo1euvG2RQOpOcmNh 0kLWp5uqYtWRwUszAOQM+LfuvVPijVr1aM2Y0cMKNrgElNkTnvN5CF1mzdbjWbDp3GiKJ/l2E 3Va4Wg+LiAh3W35w4MywWErLFOmz7rRI6d9KvwKO79CesDqfntCP/7wECyesezZRtvIXeEEdB Bz3OrPbpgSz4oVeagLSXEuSyw8wbp9xm9CLVLMXXvdSddznLFGuZrsGBZXqjcVOIkNfSofZkW 71Id5q0dvcYG3hLEvjCTTeClBAn0zV0o8Epx6QcOy4W31CxxGv5PM3GECaY6/x/blHE3n9HZH uukY62E8stXfHj2ciBHA== 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. Signed-off-by: Lino Sanfilippo Reported-by: kernel test robot Reported-by: kernel test robot --- 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 d78f86f..2eadfa5 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(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(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, };