From: Lee Jones <lee.jones@linaro.org>
To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: kernel@stlinux.com, maxime.coquelin@st.com,
thierry.reding@gmail.com, linux-pwm@vger.kernel.org,
ajitpal.singh@st.com, Lee Jones <lee.jones@linaro.org>
Subject: [RESEND 10/11] pwm: sti: Enable PWM Capture
Date: Wed, 2 Mar 2016 15:32:08 +0000 [thread overview]
Message-ID: <1456932729-9667-11-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1456932729-9667-1-git-send-email-lee.jones@linaro.org>
Once all functionality is in place, we provide the means to
enable PWM Capture. Here we are simply obtaining the
associated regmap and twiddling the relevant enable register
bits.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/pwm/pwm-sti.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c
index 8de9b4a..93cf20e 100644
--- a/drivers/pwm/pwm-sti.c
+++ b/drivers/pwm/pwm-sti.c
@@ -279,6 +279,13 @@ static int sti_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
pwm->hwpwm);
goto out;
}
+
+ ret = regmap_field_write(pc->pwm_cpt_en, 1);
+ if (ret) {
+ dev_err(dev, "failed to enable PWM capture:%d\n",
+ pwm->hwpwm);
+ goto out;
+ }
}
pc->en_count++;
out:
@@ -296,6 +303,7 @@ static void sti_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
return;
}
regmap_field_write(pc->pwm_out_en, 0);
+ regmap_field_write(pc->pwm_cpt_en, 0);
clk_disable(pc->pwm_clk);
clk_disable(pc->cpt_clk);
@@ -492,6 +500,11 @@ static int sti_pwm_probe_dt(struct sti_pwm_chip *pc)
if (IS_ERR(pc->pwm_out_en))
return PTR_ERR(pc->pwm_out_en);
+ pc->pwm_cpt_en = devm_regmap_field_alloc(dev, pc->regmap,
+ reg_fields[PWM_CPT_EN]);
+ if (IS_ERR(pc->pwm_cpt_en))
+ return PTR_ERR(pc->pwm_cpt_en);
+
pc->pwm_cpt_int_en = devm_regmap_field_alloc(dev, pc->regmap,
reg_fields[PWM_CPT_INT_EN]);
if (IS_ERR(pc->pwm_cpt_int_en))
--
1.9.1
next prev parent reply other threads:[~2016-03-02 15:32 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-02 15:31 [RESEND 00/11] pwm: Add support for PWM Capture Lee Jones
2016-03-02 15:31 ` [RESEND 01/11] pwm: Add PWM Capture support Lee Jones
2016-04-12 10:08 ` Thierry Reding
2016-04-13 9:36 ` Lee Jones
2016-04-13 14:50 ` Thierry Reding
2016-03-02 15:32 ` [RESEND 02/11] pwm: sysfs: " Lee Jones
2016-04-12 10:15 ` Thierry Reding
2016-04-13 9:40 ` Lee Jones
2016-03-02 15:32 ` [RESEND 03/11] pwm: sti: Reorganise register names in preparation for new functionality Lee Jones
2016-03-02 15:32 ` [RESEND 04/11] pwm: sti: Only request clock rate when you need to Lee Jones
2016-03-02 15:32 ` [RESEND 05/11] pwm: sti: Supply PWM Capture register addresses and bit locations Lee Jones
2016-03-02 15:32 ` [RESEND 06/11] pwm: sti: Supply PWM Capture clock handling Lee Jones
2016-03-02 15:32 ` [RESEND 07/11] pwm: sti: Initialise PWM Capture channel data Lee Jones
2016-04-12 10:29 ` Thierry Reding
2016-04-15 12:39 ` Lee Jones
2016-04-15 14:22 ` Thierry Reding
2016-04-15 14:31 ` Lee Jones
2016-04-15 13:11 ` Lee Jones
2016-04-15 14:23 ` Thierry Reding
2016-03-02 15:32 ` [RESEND 08/11] pwm: sti: Add support for PWM Capture IRQs Lee Jones
2016-04-12 10:35 ` Thierry Reding
2016-04-13 10:05 ` Lee Jones
2016-04-13 15:16 ` Thierry Reding
2016-03-02 15:32 ` [RESEND 09/11] pwm: sti: Add PWM Capture call-back Lee Jones
2016-04-12 10:53 ` Thierry Reding
2016-04-13 10:25 ` Lee Jones
2016-04-13 15:22 ` Thierry Reding
2016-04-15 8:29 ` Lee Jones
2016-04-15 14:20 ` Thierry Reding
2016-03-02 15:32 ` Lee Jones [this message]
2016-04-12 10:56 ` [RESEND 10/11] pwm: sti: Enable PWM Capture Thierry Reding
2016-03-02 15:32 ` [RESEND 11/11] pwm: sti: Take the opportunity to conduct a little house keeping Lee Jones
2016-04-12 7:28 ` [RESEND 00/11] pwm: Add support for PWM Capture Lee Jones
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=1456932729-9667-11-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=ajitpal.singh@st.com \
--cc=kernel@stlinux.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=maxime.coquelin@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;
as well as URLs for NNTP newsgroup(s).