From: Lee Jones <lee.jones@linaro.org>
To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: kernel@stlinux.com, patrice.chotard@st.com,
thierry.reding@gmail.com, linux-pwm@vger.kernel.org,
devicetree@vger.kernel.org, Lee Jones <lee.jones@linaro.org>
Subject: [PATCH v4 11/17] pwm: sti: Supply PWM Capture clock handling
Date: Tue, 16 Aug 2016 10:35:02 +0100 [thread overview]
Message-ID: <20160816093508.28307-12-lee.jones@linaro.org> (raw)
In-Reply-To: <20160816093508.28307-1-lee.jones@linaro.org>
ST's PWM IP is supplied by 2 different clocks. One for PWM
Output and the other for Capture. This patch provides clock
handling for the latter.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/pwm/pwm-sti.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c
index f2090c0..b596783 100644
--- a/drivers/pwm/pwm-sti.c
+++ b/drivers/pwm/pwm-sti.c
@@ -74,6 +74,7 @@ struct sti_pwm_compat_data {
struct sti_pwm_chip {
struct device *dev;
struct clk *pwm_clk;
+ struct clk *cpt_clk;
struct regmap *regmap;
struct sti_pwm_compat_data *cdata;
struct regmap_field *prescale_low;
@@ -183,6 +184,10 @@ static int sti_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
if (ret)
return ret;
+ ret = clk_enable(pc->cpt_clk);
+ if (ret)
+ return ret;
+
if (!period_same) {
ret = sti_pwm_get_prescale(pc, period_ns, &prescale);
if (ret)
@@ -227,6 +232,7 @@ static int sti_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
clk_dis:
clk_disable(pc->pwm_clk);
+ clk_disable(pc->cpt_clk);
return ret;
}
@@ -246,6 +252,10 @@ static int sti_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
if (ret)
goto out;
+ ret = clk_enable(pc->cpt_clk);
+ if (ret)
+ goto out;
+
ret = regmap_field_write(pc->pwm_out_en, 1);
if (ret) {
dev_err(dev, "failed to enable PWM device:%d\n",
@@ -271,6 +281,7 @@ static void sti_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
regmap_field_write(pc->pwm_out_en, 0);
clk_disable(pc->pwm_clk);
+ clk_disable(pc->cpt_clk);
mutex_unlock(&pc->sti_pwm_lock);
}
@@ -390,6 +401,18 @@ static int sti_pwm_probe(struct platform_device *pdev)
return ret;
}
+ pc->cpt_clk = of_clk_get_by_name(dev->of_node, "capture");
+ if (IS_ERR(pc->cpt_clk)) {
+ dev_err(dev, "failed to get PWM capture clock\n");
+ return PTR_ERR(pc->cpt_clk);
+ }
+
+ ret = clk_prepare(pc->cpt_clk);
+ if (ret) {
+ dev_err(dev, "failed to prepare clock\n");
+ return ret;
+ }
+
pc->chip.dev = dev;
pc->chip.ops = &sti_pwm_ops;
pc->chip.base = -1;
@@ -399,6 +422,7 @@ static int sti_pwm_probe(struct platform_device *pdev)
ret = pwmchip_add(&pc->chip);
if (ret < 0) {
clk_unprepare(pc->pwm_clk);
+ clk_unprepare(pc->cpt_clk);
return ret;
}
@@ -416,6 +440,7 @@ static int sti_pwm_remove(struct platform_device *pdev)
pwm_disable(&pc->chip.pwms[i]);
clk_unprepare(pc->pwm_clk);
+ clk_unprepare(pc->cpt_clk);
return pwmchip_remove(&pc->chip);
}
--
2.9.0
next prev parent reply other threads:[~2016-08-16 9:37 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-16 9:34 [PATCH v4 00/17] pwm: Add support for PWM Capture Lee Jones
2016-08-16 9:34 ` [PATCH v4 01/17] ARM: dts: STiH407: Supply PWM Capture IRQ Lee Jones
2016-08-16 9:34 ` [PATCH v4 02/17] ARM: dts: STiH407: Declare PWM Capture data lines via Pinctrl Lee Jones
2016-08-16 9:34 ` [PATCH v4 03/17] ARM: dts: STiH416: Supply PWM Capture IRQs Lee Jones
2016-08-16 9:34 ` [PATCH v4 04/17] ARM: dts: STiH416: Declare PWM Capture data lines via Pinctrl Lee Jones
2016-08-16 9:34 ` [PATCH v4 05/17] ARM: dts: STiH416: Define PWM Capture clock Lee Jones
2016-08-16 9:34 ` [PATCH v4 06/17] ARM: dts: STiH416: Define the number of PWM Capture channels Lee Jones
2016-08-16 9:34 ` [PATCH v4 07/17] pwm: sti: Rename channel => device Lee Jones
2016-09-05 10:33 ` Thierry Reding
2016-08-16 9:34 ` [PATCH v4 08/17] pwm: sti: Reorganise register names in preparation for new functionality Lee Jones
2016-09-05 10:35 ` Thierry Reding
2016-08-16 9:35 ` [PATCH v4 09/17] pwm: sti: Only request clock rate when you need to Lee Jones
2016-09-05 10:36 ` Thierry Reding
2016-08-16 9:35 ` [PATCH v4 10/17] pwm: sti: Supply PWM Capture register addresses and bit locations Lee Jones
2016-09-05 10:41 ` Thierry Reding
2016-08-16 9:35 ` Lee Jones [this message]
2016-09-05 10:42 ` [PATCH v4 11/17] pwm: sti: Supply PWM Capture clock handling Thierry Reding
2016-08-16 9:35 ` [PATCH v4 12/17] pwm: sti: Initialise PWM Capture device data Lee Jones
2016-09-05 10:50 ` Thierry Reding
2016-08-16 9:35 ` [PATCH v4 13/17] pwm: sti: Add support for PWM Capture IRQs Lee Jones
2016-09-05 10:53 ` Thierry Reding
2016-08-16 9:35 ` [PATCH v4 14/17] pwm: sti: Add PWM Capture call-back Lee Jones
2016-09-05 11:10 ` Thierry Reding
2016-08-16 9:35 ` [PATCH v4 15/17] pwm: sti: It's now valid for number of PWM channels to be zero Lee Jones
2016-09-05 11:20 ` Thierry Reding
2016-08-16 9:35 ` [PATCH v4 16/17] pwm: sti: Take the opportunity to conduct a little house keeping Lee Jones
2016-09-05 11:37 ` Thierry Reding
2016-08-16 9:35 ` [PATCH v4 17/17] dt-bindings: pwm: sti: Update DT bindings with recent changes Lee Jones
2016-08-18 19:20 ` Rob Herring
2016-08-19 8:35 ` Lee Jones
2016-08-19 12:45 ` Rob Herring
2016-09-05 10:29 ` Thierry Reding
2016-08-25 11:51 ` [STLinux Kernel] [PATCH v4 00/17] pwm: Add support for PWM Capture Peter Griffin
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=20160816093508.28307-12-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=kernel@stlinux.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=patrice.chotard@st.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
all inboxes | Powered by JetHome®