From patchwork Fri Apr 22 10:18:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 66426 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp631878qge; Fri, 22 Apr 2016 03:19:13 -0700 (PDT) X-Received: by 10.66.122.100 with SMTP id lr4mr26159397pab.99.1461320352968; Fri, 22 Apr 2016 03:19:12 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id uv6si6968714pac.176.2016.04.22.03.19.12; Fri, 22 Apr 2016 03:19:12 -0700 (PDT) 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; dkim=pass header.i=@linaro.org; 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; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753002AbcDVKS7 (ORCPT + 29 others); Fri, 22 Apr 2016 06:18:59 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:38317 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751718AbcDVKSh (ORCPT ); Fri, 22 Apr 2016 06:18:37 -0400 Received: by mail-wm0-f46.google.com with SMTP id u206so19371912wme.1 for ; Fri, 22 Apr 2016 03:18:36 -0700 (PDT) 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=QVVoLAS0CPSQ3Qwsepl2HWQTgDzCVXkjbDb4fWRqJLA=; b=fe5R045GP7tu1o0uWV3gSG/+mr9HS+vTZrx0f5VzBndPxtHgr0RRFlpP1jZ34NeuJ2 2jhKfypcr+Qe+wVzGNkqPy2AnDvaMED0L1LsKGC11qrq1/5AKXtKGWdT7Qeayw19qOqT BDDgi9tUDWKM95xsJVnoR2gqPVmMjN71jigoM= 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=QVVoLAS0CPSQ3Qwsepl2HWQTgDzCVXkjbDb4fWRqJLA=; b=V8EfAJmwxOP0VnWHIGGX9+FNzm8PlDzAj182LcAVtTPMwjW2IIazKaiqDP/spGZC4p IoCDFpKAHl1vRyjqHTZXc0ux1VY5/hbiky5IU08IcduchcXfmgOOMoJ+l52ahciFHXtG KuYskkRBAPs1Zvzwduk/0Vo+HykogCSnxbwNJUyTznudeoGc+dGoV0TuQkDcu5bFsvAw gBd9/8vWrNSFLqf2+cUtW8Ra9GaFuRXw1jg6puu1Lc4pgPoeJ1D0eH+TnsyJnto+coPM nmddGlSB8ga4CmxiAUBs3wSOI6U4/8BaLy6y6267eEslSvX2JCeULUXhLuHu2H7OREN+ XT/Q== X-Gm-Message-State: AOPr4FVsg0cxxm/AOD+cnpkuXTN5F8pWlpo33fZ+C5RUyqESixC+FTshQxKD6N1oZ4AK3LfU X-Received: by 10.194.117.7 with SMTP id ka7mr19570355wjb.116.1461320310514; Fri, 22 Apr 2016 03:18:30 -0700 (PDT) Received: from dell.localdomain (host81-129-172-5.range81-129.btcentralplus.com. [81.129.172.5]) by smtp.gmail.com with ESMTPSA id a1sm7316345wje.43.2016.04.22.03.18.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Apr 2016 03:18:29 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: kernel@stlinux.com, maxime.coquelin@st.com, linux-pwm@vger.kernel.org, thierry.reding@gmail.com, ajitpal.singh@st.com, Lee Jones Subject: [[PATCH v2] 10/11] pwm: sti: Add PWM Capture call-back Date: Fri, 22 Apr 2016 11:18:14 +0100 Message-Id: <1461320295-20414-11-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1461320295-20414-1-git-send-email-lee.jones@linaro.org> References: <1461320295-20414-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 | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) -- 2.8.0 diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c index 2230afb..cecb6d4 100644 --- a/drivers/pwm/pwm-sti.c +++ b/drivers/pwm/pwm-sti.c @@ -24,6 +24,8 @@ #include #include +#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 int timeout_ms) +{ + 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_ms)); + + 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); + do_div(result->period, effective_ticks); + + result->duty_cycle = SECS_TO_NANOSECS(high); + do_div(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))