From: Lukasz Majewski <lukma@denx.de>
To: Thierry Reding <thierry.reding@gmail.com>,
Sascha Hauer <s.hauer@pengutronix.de>,
Stefan Agner <stefan@agner.ch>,
Boris Brezillon <boris.brezillon@free-electrons.com>,
linux-pwm@vger.kernel.org,
Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>,
linux-kernel@vger.kernel.org
Cc: Lothar Wassmann <LW@karo-electronics.de>,
kernel@pengutronix.de, Fabio Estevam <fabio.estevam@nxp.com>,
Lukasz Majewski <l.majewski@majess.pl>
Subject: [PATCH v4 05/11] pwm: imx: Move PWMv2 software reset code to a separate function
Date: Thu, 5 Jan 2017 00:36:48 +0100 [thread overview]
Message-ID: <1483573014-13185-6-git-send-email-lukma@denx.de> (raw)
In-Reply-To: <1483573014-13185-1-git-send-email-lukma@denx.de>
From: Lukasz Majewski <l.majewski@majess.pl>
The software reset code has been extracted from imx_pwm_config_v2 function
and moved to new one - imx_pwm_sw_reset().
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>
---
Changes for v4:
- None
Changes for v3:
- None
Changes for v2:
- Add missing parenthesis
---
drivers/pwm/pwm-imx.c | 31 +++++++++++++++++++++----------
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index 11e3f3e..f0d78f3 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -120,6 +120,25 @@ static void imx_pwm_disable_v1(struct pwm_chip *chip, struct pwm_device *pwm)
clk_disable_unprepare(imx->clk_per);
}
+static void imx_pwm_sw_reset(struct pwm_chip *chip)
+{
+ struct imx_chip *imx = to_imx_chip(chip);
+ struct device *dev = chip->dev;
+ int wait_count = 0;
+ u32 cr;
+
+ writel(MX3_PWMCR_SWR, imx->mmio_base + MX3_PWMCR);
+ do {
+ usleep_range(200, 1000);
+ cr = readl(imx->mmio_base + MX3_PWMCR);
+ } while ((cr & MX3_PWMCR_SWR) &&
+ (wait_count++ < MX3_PWM_SWR_LOOP));
+
+ if (cr & MX3_PWMCR_SWR)
+ dev_warn(dev, "software reset timeout\n");
+}
+
+
static int imx_pwm_config_v2(struct pwm_chip *chip,
struct pwm_device *pwm, int duty_ns, int period_ns)
{
@@ -129,7 +148,7 @@ static int imx_pwm_config_v2(struct pwm_chip *chip,
unsigned long period_cycles, duty_cycles, prescale;
unsigned int period_ms;
bool enable = pwm_is_enabled(pwm);
- int wait_count = 0, fifoav;
+ int fifoav;
u32 cr, sr;
/*
@@ -152,15 +171,7 @@ static int imx_pwm_config_v2(struct pwm_chip *chip,
dev_warn(dev, "there is no free FIFO slot\n");
}
} else {
- writel(MX3_PWMCR_SWR, imx->mmio_base + MX3_PWMCR);
- do {
- usleep_range(200, 1000);
- cr = readl(imx->mmio_base + MX3_PWMCR);
- } while ((cr & MX3_PWMCR_SWR) &&
- (wait_count++ < MX3_PWM_SWR_LOOP));
-
- if (cr & MX3_PWMCR_SWR)
- dev_warn(dev, "software reset timeout\n");
+ imx_pwm_sw_reset(chip);
}
c = clk_get_rate(imx->clk_per);
--
2.1.4
next prev parent reply other threads:[~2017-01-04 23:37 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-04 23:36 [PATCH v4 00/11] pwm: imx: Provide atomic operation for IMX PWM driver Lukasz Majewski
2017-01-04 23:36 ` [PATCH v4 01/11] pwm: print error messages with pr_err() instead of pr_debug() Lukasz Majewski
2017-01-04 23:36 ` [PATCH v4 02/11] pwm: imx: remove ipg clock and enable per clock when required Lukasz Majewski
2017-01-05 7:14 ` Boris Brezillon
2017-01-05 7:26 ` Lukasz Majewski
2017-01-05 8:27 ` Boris Brezillon
2017-01-05 8:32 ` Lukasz Majewski
2017-01-10 17:28 ` Stefan Agner
2017-01-04 23:36 ` [PATCH v4 03/11] pwm: imx: Add separate set of pwm ops for PWMv1 and PWMv2 Lukasz Majewski
2017-01-04 23:36 ` [PATCH v4 04/11] pwm: imx: Rewrite imx_pwm_*_v1 code to facilitate switch to atomic pwm operation Lukasz Majewski
2017-01-04 23:36 ` Lukasz Majewski [this message]
2017-01-04 23:36 ` [PATCH v4 06/11] pwm: imx: Move PWMv2 wait for fifo slot code to a separate function Lukasz Majewski
2017-01-04 23:36 ` [PATCH v4 07/11] pwm: imx: Provide atomic PWM support for i.MX PWMv2 Lukasz Majewski
2017-01-05 8:50 ` Boris Brezillon
2017-01-05 9:03 ` Lukasz Majewski
2017-01-05 9:19 ` Boris Brezillon
2017-01-05 9:35 ` Lukasz Majewski
2017-01-05 9:53 ` Boris Brezillon
2017-01-10 3:14 ` Stefan Agner
2017-01-10 7:59 ` Boris Brezillon
2017-01-05 21:15 ` Andy Shevchenko
2017-01-06 7:06 ` Boris Brezillon
2017-01-07 18:35 ` Lukasz Majewski
2017-01-04 23:36 ` [PATCH v4 08/11] pwm: imx: Remove redundant i.MX PWMv2 code Lukasz Majewski
2017-01-04 23:36 ` [PATCH v4 09/11] pwm: core: make the PWM_POLARITY flag in DTB optional Lukasz Majewski
2017-01-04 23:36 ` [PATCH v4 10/11] pwm: imx: doc: Update imx-pwm.txt documentation entry Lukasz Majewski
2017-01-04 23:36 ` [PATCH v4 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=1483573014-13185-6-git-send-email-lukma@denx.de \
--to=lukma@denx.de \
--cc=LW@karo-electronics.de \
--cc=bhuvanchandra.dv@toradex.com \
--cc=boris.brezillon@free-electrons.com \
--cc=fabio.estevam@nxp.com \
--cc=kernel@pengutronix.de \
--cc=l.majewski@majess.pl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=s.hauer@pengutronix.de \
--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).