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 <lukma@denx.de>,
Lukasz Majewski <l.majewski@majess.pl>
Subject: [PATCH v5 07/11] pwm: imx: Provide atomic PWM support for i.MX PWMv2
Date: Sun, 29 Jan 2017 22:54:11 +0100 [thread overview]
Message-ID: <1485726855-16236-8-git-send-email-lukma@denx.de> (raw)
In-Reply-To: <1485726855-16236-1-git-send-email-lukma@denx.de>
This commit provides apply() callback implementation for i.MX's PWMv2.
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>
---
Changes for v5:
- Modify ->apply() function to avoid unbalanced clock enabling/disabling
- Fix preventing iMX7 from hanging
Changes for v4:
- Avoid recalculation of PWM parameters when disabling PWM signal
- Unconditionally call clk_prepare_enable(imx->clk_per) and
clk_disable_unprepare(imx->clk_per)
Changes for v3:
- Remove ipg clock enable/disable functions
Changes for v2:
- None
---
drivers/pwm/pwm-imx.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 68 insertions(+)
diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index 60cdc5c..fdaa11b 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -249,6 +249,73 @@ static int imx_pwm_config(struct pwm_chip *chip,
return ret;
}
+static int imx_pwm_apply_v2(struct pwm_chip *chip, struct pwm_device *pwm,
+ struct pwm_state *state)
+{
+ unsigned long period_cycles, duty_cycles, prescale;
+ struct imx_chip *imx = to_imx_chip(chip);
+ struct pwm_state cstate;
+ unsigned long long c;
+ int ret;
+
+ pwm_get_state(pwm, &cstate);
+
+ if (state->enabled) {
+ c = clk_get_rate(imx->clk_per);
+ c *= state->period;
+
+ do_div(c, 1000000000);
+ period_cycles = c;
+
+ prescale = period_cycles / 0x10000 + 1;
+
+ period_cycles /= prescale;
+ c = (unsigned long long)period_cycles * state->duty_cycle;
+ do_div(c, state->period);
+ duty_cycles = c;
+
+ /*
+ * according to imx pwm RM, the real period value should be
+ * PERIOD value in PWMPR plus 2.
+ */
+ if (period_cycles > 2)
+ period_cycles -= 2;
+ else
+ period_cycles = 0;
+
+ /*
+ * Wait for a free FIFO slot if the PWM is already enabled, and
+ * flush the FIFO if the PWM was disabled and is about to be
+ * enabled.
+ */
+ if (cstate.enabled) {
+ imx_pwm_wait_fifo_slot(chip, pwm);
+ } else if (state->enabled) {
+ ret = clk_prepare_enable(imx->clk_per);
+ if (ret)
+ return ret;
+
+ imx_pwm_sw_reset(chip);
+ }
+
+ writel(duty_cycles, imx->mmio_base + MX3_PWMSAR);
+ writel(period_cycles, imx->mmio_base + MX3_PWMPR);
+
+ writel(MX3_PWMCR_PRESCALER(prescale) |
+ MX3_PWMCR_DOZEEN | MX3_PWMCR_WAITEN |
+ MX3_PWMCR_DBGEN | MX3_PWMCR_CLKSRC_IPG_HIGH |
+ MX3_PWMCR_EN,
+ imx->mmio_base + MX3_PWMCR);
+
+ } else if (cstate.enabled) {
+ writel(0, imx->mmio_base + MX3_PWMCR);
+
+ clk_disable_unprepare(imx->clk_per);
+ }
+
+ return 0;
+}
+
static int imx_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
{
struct imx_chip *imx = to_imx_chip(chip);
@@ -280,6 +347,7 @@ static struct pwm_ops imx_pwm_ops_v1 = {
};
static struct pwm_ops imx_pwm_ops_v2 = {
+ .apply = imx_pwm_apply_v2,
.enable = imx_pwm_enable,
.disable = imx_pwm_disable,
.config = imx_pwm_config,
--
2.1.4
next prev parent reply other threads:[~2017-01-29 21:56 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-29 21:54 [PATCH v5 00/11] pwm: imx: Provide atomic operation for IMX PWM driver Lukasz Majewski
2017-01-29 21:54 ` [PATCH v5 01/11] pwm: print error messages with pr_err() instead of pr_debug() Lukasz Majewski
2017-01-29 21:54 ` [PATCH v5 02/11] pwm: imx: remove ipg clock and enable per clock when required Lukasz Majewski
2017-01-29 21:54 ` [PATCH v5 03/11] pwm: imx: Add separate set of pwm ops for PWMv1 and PWMv2 Lukasz Majewski
2017-01-30 7:23 ` Thierry Reding
2017-01-30 7:43 ` Thierry Reding
2017-01-30 8:36 ` Lukasz Majewski
2017-01-30 8:45 ` Thierry Reding
2017-01-30 8:55 ` Lukasz Majewski
2017-01-30 9:04 ` Thierry Reding
2017-01-29 21:54 ` [PATCH v5 04/11] pwm: imx: Rewrite imx_pwm_*_v1 code to facilitate switch to atomic pwm operation Lukasz Majewski
2017-01-29 21:54 ` [PATCH v5 05/11] pwm: imx: Move PWMv2 software reset code to a separate function Lukasz Majewski
2017-01-30 7:26 ` Thierry Reding
2017-01-29 21:54 ` [PATCH v5 06/11] pwm: imx: Move PWMv2 wait for fifo slot " Lukasz Majewski
2017-01-29 21:54 ` Lukasz Majewski [this message]
2017-01-30 7:49 ` [PATCH v5 07/11] pwm: imx: Provide atomic PWM support for i.MX PWMv2 Boris Brezillon
2017-01-30 7:54 ` Thierry Reding
2017-01-29 21:54 ` [PATCH v5 08/11] pwm: imx: Remove redundant i.MX PWMv2 code Lukasz Majewski
2017-01-29 21:54 ` [PATCH v5 09/11] pwm: core: make the PWM_POLARITY flag in DTB optional Lukasz Majewski
2017-01-29 21:54 ` [PATCH v5 10/11] pwm: imx: doc: Update imx-pwm.txt documentation entry Lukasz Majewski
2017-01-29 21:54 ` [PATCH v5 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=1485726855-16236-8-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).