From patchwork Wed Mar 2 15:32:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 591018 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8396A140B0E for ; Thu, 3 Mar 2016 02:35:58 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b=GdaS2eIT; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755442AbcCBPf6 (ORCPT ); Wed, 2 Mar 2016 10:35:58 -0500 Received: from mail-wm0-f47.google.com ([74.125.82.47]:35708 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754959AbcCBPeX (ORCPT ); Wed, 2 Mar 2016 10:34:23 -0500 Received: by mail-wm0-f47.google.com with SMTP id l68so91157263wml.0 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=CHBCAzGFBklt/fKjDXf3T1fFVr3czPjS/tsh6DGcjQQ=; b=GdaS2eITJbZDQ9IlOz9M6aVQ+8zv3DtsNFodfhfdovmSqwiU6L5Dx+OPaxyqhXiWvf HLncQxou66PNxhEo12mu/MiQPETTgGdX8f4/YYpIzrX1Lhty4RLSpB4gSNfyYqMkxesR AS/eYxEImPc0IqlcugYQy0vfcmyROAwTATAIo= 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=CHBCAzGFBklt/fKjDXf3T1fFVr3czPjS/tsh6DGcjQQ=; b=QC53W/38pubTaiWKs1ikvoU2XFEk+yMb3EZaQg/u1Fn3mMXeNmFPTY++YPKneaugA1 DCLyovmGiOK8Lbwl9Y1Vz1UQQG0P4o3mASpyus+i0/0qyZq2yKHXAevRleNbG86zIvvE CerjYqZ8XL24rK4+BJRVA0oSF/DQ8gCLqPxwBnXLWXSK7B9n6DwcXb0h+1bVpfynipW9 OEcCUNRsOVG0U73WawbIa2SdLK9FuXXm+2enI47dfHOUYmNdM7TucV4oUVnH+b3m1Rvk RVHwfFTGW7/Hg2uKkz6Ct+TMacoCt5leePC/AuUC0EbpZ8iN1d01ONijVUKoPW4KVbwX cTYw== X-Gm-Message-State: AD7BkJJ4zmK5Bbec8XcHvkHc/+hiGhaFVFBYXSUUd//wSTwBDD00JcZRgbUaJWK09s6aHb9C X-Received: by 10.194.58.169 with SMTP id s9mr26970967wjq.52.1456932862280; Wed, 02 Mar 2016 07:34:22 -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.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Mar 2016 07:34:21 -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 08/11] pwm: sti: Add support for PWM Capture IRQs Date: Wed, 2 Mar 2016 15:32:06 +0000 Message-Id: <1456932729-9667-9-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-pwm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pwm@vger.kernel.org Here we're requesting the PWM Capture IRQ and supplying the handler which will be called in the event of an IRQ fire to handle it. Signed-off-by: Lee Jones --- drivers/pwm/pwm-sti.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c index fca692a..82a69e4 100644 --- a/drivers/pwm/pwm-sti.c +++ b/drivers/pwm/pwm-sti.c @@ -12,6 +12,7 @@ #include #include +#include #include #include #include @@ -94,7 +95,9 @@ struct sti_pwm_chip { struct regmap_field *prescale_low; struct regmap_field *prescale_high; struct regmap_field *pwm_out_en; + struct regmap_field *pwm_cpt_en; struct regmap_field *pwm_cpt_int_en; + struct regmap_field *pwm_cpt_int_stat; struct pwm_chip chip; struct pwm_device *cur; unsigned long configured; @@ -314,6 +317,74 @@ static const struct pwm_ops sti_pwm_ops = { .owner = THIS_MODULE, }; +static irqreturn_t sti_pwm_interrupt(int irq, void *data) +{ + struct sti_pwm_chip *pc = data; + struct device *dev = pc->dev; + struct sti_cpt_data *d; + int channel; + int cpt_int_stat; + int reg; + int ret = IRQ_NONE; + + ret = regmap_field_read(pc->pwm_cpt_int_stat, &cpt_int_stat); + if (ret) + return ret; + + while (cpt_int_stat) { + channel = ffs(cpt_int_stat) - 1; + + d = pc->cpt_data[channel]; + + /* + * Capture input: + * _______ _______ + * | | | | + * __| |_________________| |________ + * ^0 ^1 ^2 + * + * Capture start by the first available rising edge + * When a capture event occurs, capture value (CPT_VALx) + * is stored, index incremented, capture edge changed. + * + * After the capture, if the index > 1, we have collected + * the necessary data so we signal the thread waiting for it + * and disable the capture by setting capture edge to none + * + */ + + regmap_read(pc->regmap, + PWM_CPT_VAL(channel), &d->snapshot[d->index]); + + switch (d->index) { + case 0: + case 1: + regmap_read(pc->regmap, PWM_CPT_EDGE(channel), ®); + reg ^= PWM_CPT_EDGE_MASK; + regmap_write(pc->regmap, PWM_CPT_EDGE(channel), reg); + + d->index++; + break; + case 2: + regmap_write(pc->regmap, + PWM_CPT_EDGE(channel), CPT_EDGE_DISABLED); + wake_up(&d->wait); + break; + default: + dev_err(dev, "Internal error\n"); + } + + clear_bit(channel, (unsigned long int *)&cpt_int_stat); + + ret = IRQ_HANDLED; + } + + /* Just ACK everything */ + regmap_write(pc->regmap, PWM_INT_ACK, PWM_INT_ACK_MASK); + + return ret; +} + static int sti_pwm_probe_dt(struct sti_pwm_chip *pc) { struct device *dev = pc->dev; @@ -354,6 +425,11 @@ static int sti_pwm_probe_dt(struct sti_pwm_chip *pc) if (IS_ERR(pc->pwm_cpt_int_en)) return PTR_ERR(pc->pwm_cpt_int_en); + pc->pwm_cpt_int_stat = devm_regmap_field_alloc(dev, pc->regmap, + reg_fields[PWM_CPT_INT_STAT]); + if (IS_ERR(pc->pwm_cpt_int_stat)) + return PTR_ERR(pc->pwm_cpt_int_stat); + return 0; } @@ -371,7 +447,7 @@ static int sti_pwm_probe(struct platform_device *pdev) struct sti_pwm_chip *pc; struct resource *res; unsigned int chan; - int ret; + int ret, irq; pc = devm_kzalloc(dev, sizeof(*pc), GFP_KERNEL); if (!pc) @@ -392,6 +468,19 @@ static int sti_pwm_probe(struct platform_device *pdev) if (IS_ERR(pc->regmap)) return PTR_ERR(pc->regmap); + irq = platform_get_irq(pdev, 0); + if (irq < 0) { + dev_err(&pdev->dev, "Failed to obtain IRQ\n"); + return -ENODEV; + } + + ret = devm_request_irq(&pdev->dev, irq, sti_pwm_interrupt, + 0, pdev->name, (void *) pc); + if (ret < 0) { + dev_err(&pdev->dev, "Failed to request IRQ\n"); + return ret; + } + /* * Setup PWM data with default values: some values could be replaced * with specific ones provided from Device Tree.