From: Boris Brezillon <boris.brezillon@free-electrons.com>
To: Lukasz Majewski <l.majewski@majess.pl>
Cc: Thierry Reding <thierry.reding@gmail.com>,
Stefan Agner <stefan@agner.ch>,
linux-pwm@vger.kernel.org, linux-kernel@vger.kernel.org,
Fabio Estevam <fabio.estevam@nxp.com>,
Fabio Estevam <festevam@gmail.com>,
Lothar Wassmann <LW@karo-electronics.de>,
Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>,
kernel@pengutronix.de
Subject: Re: [PATCH 3/6] pwm: imx: Move PWMv2 wait for fifo slot code to a separate function
Date: Mon, 24 Oct 2016 17:23:49 +0200 [thread overview]
Message-ID: <20161024172349.496a7386@bbrezillon> (raw)
In-Reply-To: <1477259146-19167-4-git-send-email-l.majewski@majess.pl>
On Sun, 23 Oct 2016 23:45:43 +0200
Lukasz Majewski <l.majewski@majess.pl> wrote:
> The code, which waits for fifo slot, has been extracted from
> imx_pwm_config_v2 function and moved to new one - imx_pwm_wait_fifo_slot().
>
> This change reduces the overall size of imx_pwm_config_v2() and prepares
> it for atomic PWM operation.
>
> Suggested-by: Stefan Agner <stefan@agner.ch>
> Suggested-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Signed-off-by: Lukasz Majewski <l.majewski@majess.pl>
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> ---
> drivers/pwm/pwm-imx.c | 42 +++++++++++++++++++++++++-----------------
> 1 file changed, 25 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
> index fac5c93..f3577c5 100644
> --- a/drivers/pwm/pwm-imx.c
> +++ b/drivers/pwm/pwm-imx.c
> @@ -149,18 +149,36 @@ static void imx_pwm_sw_reset(struct pwm_chip *chip)
> dev_warn(dev, "software reset timeout\n");
> }
>
> +static void imx_pwm_wait_fifo_slot(struct pwm_chip *chip,
> + struct pwm_device *pwm)
> +{
> + struct imx_chip *imx = to_imx_chip(chip);
> + struct device *dev = chip->dev;
> + unsigned int period_ms;
> + int fifoav;
> + u32 sr;
> +
> + sr = readl(imx->mmio_base + MX3_PWMSR);
> + fifoav = sr & MX3_PWMSR_FIFOAV_MASK;
> + if (fifoav == MX3_PWMSR_FIFOAV_4WORDS) {
> + period_ms = DIV_ROUND_UP(pwm_get_period(pwm),
> + NSEC_PER_MSEC);
> + msleep(period_ms);
> +
> + sr = readl(imx->mmio_base + MX3_PWMSR);
> + if (fifoav == (sr & MX3_PWMSR_FIFOAV_MASK))
> + dev_warn(dev, "there is no free FIFO slot\n");
> + }
> +}
>
> static int imx_pwm_config_v2(struct pwm_chip *chip,
> struct pwm_device *pwm, int duty_ns, int period_ns)
> {
> struct imx_chip *imx = to_imx_chip(chip);
> - struct device *dev = chip->dev;
> unsigned long long c;
> unsigned long period_cycles, duty_cycles, prescale;
> - unsigned int period_ms;
> bool enable = pwm_is_enabled(pwm);
> - int fifoav;
> - u32 cr, sr;
> + u32 cr;
>
> /*
> * i.MX PWMv2 has a 4-word sample FIFO.
> @@ -169,19 +187,9 @@ static int imx_pwm_config_v2(struct pwm_chip *chip,
> * wait for a full PWM cycle to get a relinquished FIFO slot
> * when the controller is enabled and the FIFO is fully loaded.
> */
> - if (enable) {
> - sr = readl(imx->mmio_base + MX3_PWMSR);
> - fifoav = sr & MX3_PWMSR_FIFOAV_MASK;
> - if (fifoav == MX3_PWMSR_FIFOAV_4WORDS) {
> - period_ms = DIV_ROUND_UP(pwm_get_period(pwm),
> - NSEC_PER_MSEC);
> - msleep(period_ms);
> -
> - sr = readl(imx->mmio_base + MX3_PWMSR);
> - if (fifoav == (sr & MX3_PWMSR_FIFOAV_MASK))
> - dev_warn(dev, "there is no free FIFO slot\n");
> - }
> - } else
> + if (enable)
> + imx_pwm_wait_fifo_slot(chip, pwm);
> + else
> imx_pwm_sw_reset(chip);
>
> c = clk_get_rate(imx->clk_per);
next prev parent reply other threads:[~2016-10-24 15:23 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-23 21:45 [PATCH 0/6] pwm: imx: Provide atomic operation for IMX PWM driver Lukasz Majewski
2016-10-23 21:45 ` [PATCH 1/6] pwm: imx: Rewrite imx_pwm_*_v1 code to facilitate switch to atomic pwm operation Lukasz Majewski
2016-10-24 15:21 ` Boris Brezillon
2016-10-25 5:54 ` Sascha Hauer
2016-10-25 6:27 ` Boris Brezillon
2016-10-25 6:32 ` Sascha Hauer
2016-10-25 6:42 ` Boris Brezillon
2016-10-25 6:55 ` Lukasz Majewski
2016-10-23 21:45 ` [PATCH 2/6] pwm: imx: Move PWMv2 software reset code to a separate function Lukasz Majewski
2016-10-24 15:23 ` Boris Brezillon
2016-10-24 21:02 ` Lukasz Majewski
2016-10-23 21:45 ` [PATCH 3/6] pwm: imx: Move PWMv2 wait for fifo slot " Lukasz Majewski
2016-10-24 15:23 ` Boris Brezillon [this message]
2016-10-23 21:45 ` [PATCH 4/6] pwm: imx: Provide atomic PWM support for IMXv2 PWM Lukasz Majewski
2016-10-24 15:25 ` Boris Brezillon
2016-10-23 21:45 ` [PATCH 5/6] pwm: imx: Remove redundant IMX PWMv2 code Lukasz Majewski
2016-10-24 15:27 ` Boris Brezillon
2016-10-23 21:45 ` [PATCH 6/6] pwm: imx: Introduce "polarity_supported" flag to PWMv2 driver Lukasz Majewski
2016-10-24 15:28 ` Boris Brezillon
2016-10-24 15:34 ` Boris Brezillon
2016-10-24 21:14 ` Lukasz Majewski
2016-10-25 6:37 ` Boris Brezillon
2016-10-25 6:58 ` Lukasz Majewski
2016-10-24 15:36 ` [PATCH 0/6] pwm: imx: Provide atomic operation for IMX PWM driver Boris Brezillon
2016-10-24 21:26 ` Lukasz Majewski
2016-10-25 3:41 ` Stefan Agner
2016-10-25 7:07 ` Lukasz Majewski
2016-10-25 17:08 ` Fabio Estevam
2016-10-25 17:09 ` Fabio Estevam
2016-10-27 5:59 ` Lukasz Majewski
2016-12-26 22:55 ` [PATCH v3 RESEND 00/11] " Lukasz Majewski
2016-12-26 22:55 ` [PATCH v3 RESEND 01/11] pwm: print error messages with pr_err() instead of pr_debug() Lukasz Majewski
2016-12-26 22:55 ` [PATCH v3 RESEND 02/11] pwm: imx: remove ipg clock Lukasz Majewski
2016-12-27 7:26 ` Stefan Agner
2016-12-27 7:54 ` Lukasz Majewski
2016-12-28 22:01 ` Lukasz Majewski
2016-12-29 7:22 ` Stefan Agner
2016-12-29 10:06 ` Lukasz Majewski
2016-12-26 22:55 ` [PATCH v3 RESEND 03/11] pwm: imx: Add separate set of pwm ops for PWMv1 and PWMv2 Lukasz Majewski
2016-12-26 22:55 ` [PATCH v3 RESEND 04/11] pwm: imx: Rewrite imx_pwm_*_v1 code to facilitate switch to atomic pwm operation Lukasz Majewski
2016-12-26 22:55 ` [PATCH v3 RESEND 05/11] pwm: imx: Move PWMv2 software reset code to a separate function Lukasz Majewski
2016-12-26 22:55 ` [PATCH v3 RESEND 06/11] pwm: imx: Move PWMv2 wait for fifo slot " Lukasz Majewski
2016-12-26 22:55 ` [PATCH v3 RESEND 07/11] pwm: imx: Provide atomic PWM support for i.MX PWMv2 Lukasz Majewski
2016-12-29 16:21 ` Boris Brezillon
2016-12-29 16:45 ` Lukasz Majewski
2016-12-29 17:08 ` Boris Brezillon
2017-01-03 11:43 ` Lukasz Majewski
2017-01-03 12:46 ` Boris Brezillon
2017-01-03 17:29 ` Stefan Agner
2017-01-03 19:35 ` Boris Brezillon
2017-01-03 22:01 ` Lukasz Majewski
2017-01-03 22:18 ` Boris Brezillon
2017-01-03 22:46 ` Lukasz Majewski
2017-01-03 23:34 ` Boris Brezillon
2017-01-04 11:29 ` Lukasz Majewski
2016-12-26 22:55 ` [PATCH v3 RESEND 08/11] pwm: imx: Remove redundant i.MX PWMv2 code Lukasz Majewski
2016-12-26 22:55 ` [PATCH v3 RESEND 09/11] pwm: core: make the PWM_POLARITY flag in DTB optional Lukasz Majewski
2016-12-26 22:56 ` [PATCH v3 RESEND 10/11] pwm: imx: doc: Update imx-pwm.txt documentation entry Lukasz Majewski
2016-12-26 22:56 ` [PATCH v3 RESEND 11/11] pwm: imx: Add polarity inversion support to i.MX's PWMv2 Lukasz Majewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161024172349.496a7386@bbrezillon \
--to=boris.brezillon@free-electrons.com \
--cc=LW@karo-electronics.de \
--cc=bhuvanchandra.dv@toradex.com \
--cc=fabio.estevam@nxp.com \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=l.majewski@majess.pl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=stefan@agner.ch \
--cc=thierry.reding@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).