linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sam Shih <sam.shih@mediatek.com>
To: Rob Herring <robh+dt@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Matthias Brugger <matthias.bgg@gmail.com>,
	Thierry Reding <thierry.reding@gmail.com>
Cc: Ryder Lee <ryder.lee@mediatek.com>,
	John Crispin <john@phrozen.org>, <linux-pwm@vger.kernel.org>,
	<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<linux-mediatek@lists.infradead.org>,
	Sam Shih <sam.shih@mediatek.com>
Subject: [PATCH v5 03/13] pwm: mediatek: add a property "clock-frequency"
Date: Thu, 22 Aug 2019 14:58:33 +0800	[thread overview]
Message-ID: <1566457123-20791-4-git-send-email-sam.shih@mediatek.com> (raw)
In-Reply-To: <1566457123-20791-1-git-send-email-sam.shih@mediatek.com>

This fix mt7628 pwm during configure from userspace. The SoC
is legacy MIPS and has no complex clock tree. This patch add property
clock-frequency to the SoC specific data and legacy MIPS SoC need to
configure it in DT. This property is use for period calculation.

We will improve this fix by droping has-clks attribute and using
clock-frequency to do the same thing in a new patch.

Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Sam Shih <sam.shih@mediatek.com>
---
Changes since v5:
1. Follow reviewer's comments
Make the changes of fix mt7628 pwm as a single patch

Changes since v4:
- Follow reviewers's comments
1. use pc->soc->has_clks to check clocks exist or not.
2. Add error message when probe() unable to get clks
- Fixes bug when SoC is old mips which has no complex clock tree.
if clocks not exist, use the new property from DT to apply period caculation;
otherwise, use clk_get_rate to get clock frequency and apply period caculation.

Change-Id: Ibbe6d7a4f80b30f60725bcbeca1d02ce7834d28c
---
 drivers/pwm/pwm-mediatek.c | 39 ++++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/drivers/pwm/pwm-mediatek.c b/drivers/pwm/pwm-mediatek.c
index ebd62629e3fe..1f18bff4800c 100644
--- a/drivers/pwm/pwm-mediatek.c
+++ b/drivers/pwm/pwm-mediatek.c
@@ -65,11 +65,13 @@ struct mtk_pwm_platform_data {
  * @chip: linux PWM chip representation
  * @regs: base address of PWM chip
  * @clks: list of clocks
+ * @clk_freq: the fix clock frequency of legacy MIPS SoC
  */
 struct mtk_pwm_chip {
 	struct pwm_chip chip;
 	void __iomem *regs;
 	struct clk *clks[MTK_CLK_MAX];
+	unsigned int clk_freq;
 	const struct mtk_pwm_platform_data *soc;
 };
 
@@ -141,19 +143,27 @@ static int mtk_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
 			  int duty_ns, int period_ns)
 {
 	struct mtk_pwm_chip *pc = to_mtk_pwm_chip(chip);
-	struct clk *clk = pc->clks[MTK_CLK_PWM1 + pwm->hwpwm];
+	unsigned int clk_freq;
 	u32 clkdiv = 0, cnt_period, cnt_duty, reg_width = PWMDWIDTH,
 	    reg_thres = PWMTHRES;
 	u64 resolution;
 	int ret;
 
+	if (pc->soc->has_clks) {
+		struct clk *clk = pc->clks[MTK_CLK_PWM1 + pwm->hwpwm];
+
+		clk_freq = clk_get_rate(clk);
+	} else {
+		clk_freq = pc->clk_freq;
+	}
+
 	ret = mtk_pwm_clk_enable(chip, pwm);
 	if (ret < 0)
 		return ret;
 
 	/* Using resolution in picosecond gets accuracy higher */
 	resolution = (u64)NSEC_PER_SEC * 1000;
-	do_div(resolution, clk_get_rate(clk));
+	do_div(resolution, clk_freq);
 
 	cnt_period = DIV_ROUND_CLOSEST_ULL((u64)period_ns * 1000, resolution);
 	while (cnt_period > 8191) {
@@ -262,13 +272,26 @@ static int mtk_pwm_probe(struct platform_device *pdev)
 		npwms = MTK_CLK_MAX - 2;
 	}
 
-	for (i = 0; i < npwms + 2 && pc->soc->has_clks; i++) {
-		pc->clks[i] = devm_clk_get(&pdev->dev, mtk_pwm_clk_name[i]);
-		if (IS_ERR(pc->clks[i])) {
-			dev_err(&pdev->dev, "clock: %s fail: %ld\n",
-				mtk_pwm_clk_name[i], PTR_ERR(pc->clks[i]));
-			return PTR_ERR(pc->clks[i]);
+	if (pc->soc->has_clks) {
+		for (i = 0; i < npwms + 2 ; i++) {
+			pc->clks[i] = devm_clk_get(&pdev->dev,
+						  mtk_pwm_clk_name[i]);
+			if (IS_ERR(pc->clks[i])) {
+				dev_err(&pdev->dev, "clock: %s fail: %ld\n",
+					mtk_pwm_clk_name[i],
+					PTR_ERR(pc->clks[i]));
+				return PTR_ERR(pc->clks[i]);
+			}
+		}
+	} else {
+		unsigned int clk_freq;
+
+		ret = of_property_read_u32(np, "clock-frequency", &clk_freq);
+		if (ret < 0) {
+			dev_err(&pdev->dev, "failed to get clock_frequency\n");
+			return ret;
 		}
+		pc->clk_freq = clk_freq;
 	}
 
 	platform_set_drvdata(pdev, pc);
-- 
2.17.1


  parent reply	other threads:[~2019-08-22  7:00 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-22  6:58 [PATCH v5 0/13] Add mt7629 and fix mt7628 pwm Sam Shih
2019-08-22  6:58 ` [PATCH v5 01/13] pwm: mediatek: add a property "num-pwms" Sam Shih
2019-08-24  0:28   ` Uwe Kleine-König
2019-08-22  6:58 ` [PATCH v5 02/13] pwm: mediatek: droping the check for of_device_get_match_data Sam Shih
2019-08-24  0:29   ` Uwe Kleine-König
2019-08-22  6:58 ` Sam Shih [this message]
2019-08-24  0:32   ` [PATCH v5 03/13] pwm: mediatek: add a property "clock-frequency" Uwe Kleine-König
2019-08-22  6:58 ` [PATCH v5 04/13] pwm: mediatek: allocate the clks array dynamically Sam Shih
2019-08-24  0:33   ` Uwe Kleine-König
2019-08-22  6:58 ` [PATCH v5 05/13] pwm: mediatek: use pwm_mediatek as common prefix Sam Shih
2019-08-24  0:34   ` Uwe Kleine-König
2019-08-22  6:58 ` [PATCH v5 06/13] pwm: mediatek: update license and switch to SPDX tag Sam Shih
2019-08-24  0:35   ` Uwe Kleine-König
2019-08-22  6:58 ` [PATCH v5 07/13] dt-bindings: pwm: add a property "num-pwms" Sam Shih
2019-08-27 18:39   ` Rob Herring
2019-09-02 16:04     ` Uwe Kleine-König
2019-09-05  3:27       ` Sam Shih
2019-09-12  1:33       ` Sam Shih
2019-08-22  6:58 ` [PATCH v5 08/13] dt-bindings: pwm: update bindings for MT7628 SoC Sam Shih
2019-08-22  8:12   ` Yingjoe Chen
2019-08-24  0:36     ` Uwe Kleine-König
2019-08-22  6:58 ` [PATCH v5 09/13] arm64: dts: mt7622: add a property "num-pwms" for PWM Sam Shih
2019-08-24  0:38   ` Uwe Kleine-König
2019-08-22  6:58 ` [PATCH v5 10/13] arm: dts: mt7623: " Sam Shih
2019-08-24  0:38   ` Uwe Kleine-König
2019-08-22  6:58 ` [PATCH v5 11/13] dt-bindings: pwm: update bindings for MT7629 SoC Sam Shih
2019-08-24  0:39   ` Uwe Kleine-König
2019-08-22  6:58 ` [PATCH v5 12/13] pwm: mediatek: remove a property "has-clock" Sam Shih
2019-08-24  0:41   ` Uwe Kleine-König
2019-08-22  6:58 ` [PATCH v5 13/13] arm: dts: mediatek: add mt7629 pwm support Sam Shih

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=1566457123-20791-4-git-send-email-sam.shih@mediatek.com \
    --to=sam.shih@mediatek.com \
    --cc=devicetree@vger.kernel.org \
    --cc=john@phrozen.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=linux-pwm@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=matthias.bgg@gmail.com \
    --cc=robh+dt@kernel.org \
    --cc=ryder.lee@mediatek.com \
    --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).