From patchwork Wed Mar 2 15:32:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 63389 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp2448263lbc; Wed, 2 Mar 2016 07:34:40 -0800 (PST) X-Received: by 10.67.30.163 with SMTP id kf3mr39560100pad.45.1456932879077; Wed, 02 Mar 2016 07:34:39 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rm12si5701406pab.225.2016.03.02.07.34.38; Wed, 02 Mar 2016 07:34:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=pass header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755188AbcCBPea (ORCPT + 30 others); Wed, 2 Mar 2016 10:34:30 -0500 Received: from mail-wm0-f52.google.com ([74.125.82.52]:36716 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755016AbcCBPeY (ORCPT ); Wed, 2 Mar 2016 10:34:24 -0500 Received: by mail-wm0-f52.google.com with SMTP id n186so91568426wmn.1 for ; Wed, 02 Mar 2016 07:34:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sG0DMqMVuaNXG9PKwh9NX1JqEATmHKJVnLG4blCDOQU=; b=LFRdzAt6NipX2fKKNFraCiWbGAK/NcHtpgW3C4T54hehMjpiUAC4U3oU2qKcAMOn3h hPgPgjIkUx/uegzIILxmSDGHcGx8DjS5Ro6PRQtaTMNJgJEtqHd7svKyvO7tvvyN4hCl IDYHEYOfidF+bT51eeux5igvsTwOYpAvMlXsg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sG0DMqMVuaNXG9PKwh9NX1JqEATmHKJVnLG4blCDOQU=; b=XwX/+tZQJGtf1bytB8s4xmxv7rK5fKY1uAv5vpQIng34716rWEB7XS/eJe3gQv6Ii8 hCycD8P5pVY7O7h/I793+3X05m+nkGB2Bh2mhHB5VLJshO2Sc4iGK2VT/fBh0f/Ug2Wr Nfaxe6xpcMEVnYSf1DUNo3FtG66qIAEltTBpLl8TFpplwd6ECWbQGWOSzBQQo6KH4BE3 kkP9uBoF7MkARukpgYs2gpn2l0mVgvuTliiZUz7KSkoOTukdJCunuM9H7cl/DYg7ADd4 MMwC6Y/dClgDv+5jGacrGxEaEs5Fo3fCqwK+g0eI3He9VUFb3D6ETynHQfdg+2l7MA98 Sdug== X-Gm-Message-State: AD7BkJIEabI6Ze2MzkfUMZMMn+UdRJxy3X3zb1wkM2Oq6wX7QVktRZzr7KDcrRqXRAteauHE X-Received: by 10.28.21.149 with SMTP id 143mr511824wmv.86.1456932863208; Wed, 02 Mar 2016 07:34:23 -0800 (PST) Received: from localhost.localdomain (host81-154-142-245.range81-154.btcentralplus.com. [81.154.142.245]) by smtp.gmail.com with ESMTPSA id da6sm26941407wjb.24.2016.03.02.07.34.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Mar 2016 07:34:22 -0800 (PST) From: Lee Jones 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 Subject: [RESEND 09/11] pwm: sti: Add PWM Capture call-back Date: Wed, 2 Mar 2016 15:32:07 +0000 Message-Id: <1456932729-9667-10-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456932729-9667-1-git-send-email-lee.jones@linaro.org> References: <1456932729-9667-1-git-send-email-lee.jones@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 --- drivers/pwm/pwm-sti.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) -- 1.9.1 diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c index 82a69e4..8de9b4a 100644 --- a/drivers/pwm/pwm-sti.c +++ b/drivers/pwm/pwm-sti.c @@ -309,7 +309,79 @@ 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, + int channel, char *buf) +{ + struct sti_pwm_chip *pc = to_sti_pwmchip(chip); + struct sti_pwm_compat_data *cdata = pc->cdata; + struct sti_cpt_data *d = pc->cpt_data[channel]; + struct device *dev = pc->dev; + unsigned int f, dc; + unsigned int high, low; + bool level; + int ret; + + if (channel > cdata->cpt_num_chan - 1) { + dev_err(dev, "Channel %d is not valid\n", channel); + return -EINVAL; + } + + mutex_lock(&d->lock); + + /* Prepare capture measurement */ + d->index = 0; + regmap_write(pc->regmap, PWM_CPT_EDGE(channel), CPT_EDGE_RISING); + regmap_field_write(pc->pwm_cpt_int_en, BIT(channel)); + ret = wait_event_interruptible_timeout(d->wait, d->index > 1, HZ); + + /* + * In case we woke up for another reason than completion + * make sure to disable the capture. + */ + regmap_write(pc->regmap, PWM_CPT_EDGE(channel), CPT_EDGE_DISABLED); + + if (ret == -ERESTARTSYS) + goto out; + + switch (d->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 + * level of the supposed constant signal is reported + * using duty cycle min and max values. + */ + level = gpio_get_value(d->gpio); + + ret = sprintf(buf, "0:%u\n", level ? CPT_DC_MAX : 0); + break; + case 2: + /* We have evertying we need */ + high = d->snapshot[1] - d->snapshot[0]; + low = d->snapshot[2] - d->snapshot[1]; + + /* Calculate frequency in Hz */ + f = clk_get_rate(pc->cpt_clk) / (1 * (high + low)); + + /* Calculate the duty cycle */ + dc = CPT_DC_MAX * high / (high + low); + + ret = sprintf(buf, "%u:%u\n", f, dc); + default: + dev_err(dev, "Internal error\n"); + } + +out: + mutex_unlock(&d->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,