linux-pwm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: kernel-F5mvAk5X5gdBDgjK7y7TUQ@public.gmane.org,
	patrice.chotard-qxv4g6HH51o@public.gmane.org,
	thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
	linux-pwm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Subject: [PATCH v4 14/17] pwm: sti: Add PWM Capture call-back
Date: Tue, 16 Aug 2016 10:35:05 +0100	[thread overview]
Message-ID: <20160816093508.28307-15-lee.jones@linaro.org> (raw)
In-Reply-To: <20160816093508.28307-1-lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>

Once a PWM Capture has been initiated, the capture call
enables a rising edge detection IRQ, then waits.  Once each
of the 3 phase changes have been recorded the thread then
wakes.  The remaining part of the call carries out the
relevant calculations and passes back a formatted string to
the caller.

Signed-off-by: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
---
 drivers/pwm/pwm-sti.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c
index 4686ba0..fcc80eb 100644
--- a/drivers/pwm/pwm-sti.c
+++ b/drivers/pwm/pwm-sti.c
@@ -24,6 +24,8 @@
 #include <linux/time.h>
 #include <linux/wait.h>
 
+#define SECS_TO_NANOSECS(x) ((x) * 1000 * 1000 * 1000)
+
 #define PWM_OUT_VAL(x)	(0x00 + (4 * (x))) /* Device's Duty Cycle register */
 #define PWM_CPT_VAL(x)	(0x10 + (4 * (x))) /* Capture value */
 #define PWM_CPT_EDGE(x) (0x30 + (4 * (x))) /* Edge to capture on */
@@ -305,7 +307,88 @@ static void sti_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm)
 	clear_bit(pwm->hwpwm, &pc->configured);
 }
 
+static int sti_pwm_capture(struct pwm_chip *chip, struct pwm_device *pwm,
+			   struct pwm_capture *result, unsigned long timeout)
+{
+	struct sti_pwm_chip *pc = to_sti_pwmchip(chip);
+	struct sti_pwm_compat_data *cdata = pc->cdata;
+	struct sti_cpt_ddata *ddata = pwm_get_chip_data(pwm);
+	struct device *dev = pc->dev;
+	unsigned int effective_ticks;
+	unsigned long long high, low;
+	int ret;
+
+	if (pwm->hwpwm > cdata->cpt_num_devs - 1) {
+		dev_err(dev, "Device %d is not valid\n", pwm->hwpwm);
+		return -EINVAL;
+	}
+
+	mutex_lock(&ddata->lock);
+
+	/* Prepare capture measurement */
+	ddata->index = 0;
+	regmap_write(pc->regmap, PWM_CPT_EDGE(pwm->hwpwm), CPT_EDGE_RISING);
+	regmap_field_write(pc->pwm_cpt_int_en, BIT(pwm->hwpwm));
+
+	/* Enable capture */
+	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;
+	}
+
+	ret = wait_event_interruptible_timeout(ddata->wait,
+					       ddata->index > 1,
+					       msecs_to_jiffies(timeout));
+
+	regmap_write(pc->regmap, PWM_CPT_EDGE(pwm->hwpwm), CPT_EDGE_DISABLED);
+
+	if (ret == -ERESTARTSYS)
+		goto out;
+
+	switch (ddata->index) {
+	case 0:
+	case 1:
+		/*
+		 * Getting here could mean :
+		 *  - input signal is constant of less than 1Hz
+		 *  - there is no input signal at all
+		 *
+		 * In such case the frequency is rounded down to 0
+		 */
+
+		result->period = 0;
+		result->duty_cycle = 0;
+
+		break;
+	case 2:
+		/* We have everying we need */
+		high = ddata->snapshot[1] - ddata->snapshot[0];
+		low  = ddata->snapshot[2] - ddata->snapshot[1];
+
+		effective_ticks = clk_get_rate(pc->cpt_clk);
+
+		result->period = SECS_TO_NANOSECS(high + low);
+		result->period /= effective_ticks;
+
+		result->duty_cycle = SECS_TO_NANOSECS(high);
+		result->duty_cycle /= effective_ticks;
+
+		break;
+	default:
+		dev_err(dev, "Internal error\n");
+	}
+
+out:
+	/* Disable capture */
+	regmap_field_write(pc->pwm_cpt_en, 0);
+
+	mutex_unlock(&ddata->lock);
+	return ret;
+}
+
 static const struct pwm_ops sti_pwm_ops = {
+	.capture = sti_pwm_capture,
 	.config = sti_pwm_config,
 	.enable = sti_pwm_enable,
 	.disable = sti_pwm_disable,
@@ -418,6 +501,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))
-- 
2.9.0

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2016-08-16  9:35 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 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
     [not found]   ` <20160816093508.28307-9-lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-09-05 10:35     ` 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 ` [PATCH v4 11/17] pwm: sti: Supply PWM Capture clock handling Lee Jones
     [not found]   ` <20160816093508.28307-12-lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-09-05 10:42     ` Thierry Reding
     [not found] ` <20160816093508.28307-1-lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
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: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 12/17] pwm: sti: Initialise PWM Capture device data Lee Jones
2016-09-05 10:50     ` Thierry Reding
2016-08-16  9:35   ` Lee Jones [this message]
2016-09-05 11:10     ` [PATCH v4 14/17] pwm: sti: Add PWM Capture call-back 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-16  9:35 ` [PATCH v4 13/17] pwm: sti: Add support for PWM Capture IRQs Lee Jones
     [not found]   ` <20160816093508.28307-14-lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-09-05 10:53     ` 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
     [not found]   ` <20160816093508.28307-16-lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
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-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-15-lee.jones@linaro.org \
    --to=lee.jones-qsej5fyqhm4dnm+yrofe0a@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=kernel-F5mvAk5X5gdBDgjK7y7TUQ@public.gmane.org \
    --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-pwm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=patrice.chotard-qxv4g6HH51o@public.gmane.org \
    --cc=thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
    /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).