From patchwork Wed Feb 10 13:02:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 61651 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp2630418lbl; Wed, 10 Feb 2016 05:05:32 -0800 (PST) X-Received: by 10.66.90.133 with SMTP id bw5mr58187860pab.22.1455109532477; Wed, 10 Feb 2016 05:05:32 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 64si5017067pfi.163.2016.02.10.05.05.32; Wed, 10 Feb 2016 05:05:32 -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 S1751536AbcBJNEs (ORCPT + 30 others); Wed, 10 Feb 2016 08:04:48 -0500 Received: from mail-wm0-f47.google.com ([74.125.82.47]:37767 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751492AbcBJNEp (ORCPT ); Wed, 10 Feb 2016 08:04:45 -0500 Received: by mail-wm0-f47.google.com with SMTP id g62so25827306wme.0 for ; Wed, 10 Feb 2016 05:04:44 -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=TZJEgEzEXDWLsykDW1aHxAaFimrV7ONezG43/qn8BG/Z5kF0FSkIrWPJWdnPyN5RL5 ZKvqjYG9q4fzKyxJm+1UndKuctFISNe1zvZjWiz35N8TJAnsUR7aCkXEwmyRZaImA2g6 v/CLAuF3SM/NQRZZAqpgD/UcZ2jDzshU7l8yg= 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=JXkWoaFQgaeaZ/CMM6zyVq+YHmQesa/GDpyeK1obX6asdeofgZArN8NUImOvi0rmD9 yTVlx9duuuD0iVL+xeebSnlGF/us64QerFur6rd5oFpurFFfQAIHYuMqQdKAXTLJMi0w T7pA04gBZNtVrgQQJBlmCJdwWEVctu0fF+5jK+Xfy1OyOORO2Bjqrio0ukEnqWH9sOAo zvrWNbOXnJIVx5Pnrd9ToSsl0/AlH9OPqFFVUz5tud7EuLP16D4Mc5fyrS+PwjIkGiom sD4Uu2NHvOSBUjhe37UcNm1HkcayXX+vjqbVtjPYx9itlfoBqENGxRb9k7IHd/PXB7Sy aPoA== X-Gm-Message-State: AG10YOQNG0H70rH8fZ4ZwnGz1HJEkEsJeszo7bQqv0COB4wNWx2EzPDMO0Mxwa0vOOq51Y/d X-Received: by 10.28.51.9 with SMTP id z9mr1463793wmz.59.1455109484282; Wed, 10 Feb 2016 05:04:44 -0800 (PST) Received: from localhost.localdomain (host81-129-170-149.range81-129.btcentralplus.com. [81.129.170.149]) by smtp.gmail.com with ESMTPSA id q75sm22429319wmd.6.2016.02.10.05.04.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Feb 2016 05:04:43 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, thierry.reding@gmail.com, linux-pwm@vger.kernel.org, ajitpal.singh@st.com Cc: kernel@stlinux.com, maxime.coquelin@st.com, Lee Jones Subject: [PATCH 09/11] pwm: sti: Add PWM Capture call-back Date: Wed, 10 Feb 2016 13:02:26 +0000 Message-Id: <1455109348-32767-10-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455109348-32767-1-git-send-email-lee.jones@linaro.org> References: <1455109348-32767-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,