linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>,
	Philipp Zabel <p.zabel@pengutronix.de>
Subject: [PATCH v4 02/11] pwm: imx: remove ipg clock and enable per clock when required
Date: Thu,  5 Jan 2017 00:36:45 +0100	[thread overview]
Message-ID: <1483573014-13185-3-git-send-email-lukma@denx.de> (raw)
In-Reply-To: <1483573014-13185-1-git-send-email-lukma@denx.de>

From: Boris Brezillon <boris.brezillon@free-electrons.com>

The use of the ipg clock was introduced with commit 7b27c160c681
("pwm: i.MX: fix clock lookup").
In the commit message it was claimed that the ipg clock is enabled for
register accesses. This is true for the ->config() callback, but not
for the ->set_enable() callback. Given that the ipg clock is not
consistently enabled for all register accesses we can assume that either
it is not required at all or that the current code does not work.
Remove the ipg clock code for now so that it's no longer in the way of
refactoring the driver.

In the other hand, the imx7 IP requires the peripheral clock to be
enabled before accessing its registers. Since ->config() can be called
when the PWM is disabled (in which case, the peripheral clock is also
disabled), we need to surround the imx->config() with
clk_prepare_enable(per_clk)/clk_disable_unprepare(per_clk) calls.

Note that the imx7 IP was working fine so far because the ipg clock was
actually pointing to the peripheral clock, which guaranteed peripheral
clock activation even when ->config() was called when the PWM was
disabled.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
---
Changes in v4:
- Enable per clk before calling imx->config()

Changes in v3:
- New patch
---
 drivers/pwm/pwm-imx.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index d600fd5..b1d1e50 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -49,7 +49,6 @@
 
 struct imx_chip {
 	struct clk	*clk_per;
-	struct clk	*clk_ipg;
 
 	void __iomem	*mmio_base;
 
@@ -206,13 +205,13 @@ static int imx_pwm_config(struct pwm_chip *chip,
 	struct imx_chip *imx = to_imx_chip(chip);
 	int ret;
 
-	ret = clk_prepare_enable(imx->clk_ipg);
+	ret = clk_prepare_enable(imx->clk_per);
 	if (ret)
 		return ret;
 
 	ret = imx->config(chip, pwm, duty_ns, period_ns);
 
-	clk_disable_unprepare(imx->clk_ipg);
+	clk_disable_unprepare(imx->clk_per);
 
 	return ret;
 }
@@ -293,13 +292,6 @@ static int imx_pwm_probe(struct platform_device *pdev)
 		return PTR_ERR(imx->clk_per);
 	}
 
-	imx->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
-	if (IS_ERR(imx->clk_ipg)) {
-		dev_err(&pdev->dev, "getting ipg clock failed with %ld\n",
-				PTR_ERR(imx->clk_ipg));
-		return PTR_ERR(imx->clk_ipg);
-	}
-
 	imx->chip.ops = &imx_pwm_ops;
 	imx->chip.dev = &pdev->dev;
 	imx->chip.base = -1;
-- 
2.1.4

  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 ` Lukasz Majewski [this message]
2017-01-05  7:14   ` [PATCH v4 02/11] pwm: imx: remove ipg clock and enable per clock when required 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 ` [PATCH v4 05/11] pwm: imx: Move PWMv2 software reset code to a separate function Lukasz Majewski
2017-01-04 23:36 ` [PATCH v4 06/11] pwm: imx: Move PWMv2 wait for fifo slot " 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-3-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=linux-kernel@vger.kernel.org \
    --cc=linux-pwm@vger.kernel.org \
    --cc=p.zabel@pengutronix.de \
    --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).