From patchwork Tue Aug 13 20:05:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zubair Lutfullah X-Patchwork-Id: 2844010 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A12CA9F239 for ; Tue, 13 Aug 2013 20:06:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A3CD02055E for ; Tue, 13 Aug 2013 20:06:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 988DA2055A for ; Tue, 13 Aug 2013 20:06:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758937Ab3HMUFx (ORCPT ); Tue, 13 Aug 2013 16:05:53 -0400 Received: from mail-ea0-f176.google.com ([209.85.215.176]:51802 "EHLO mail-ea0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759086Ab3HMUFO (ORCPT ); Tue, 13 Aug 2013 16:05:14 -0400 Received: by mail-ea0-f176.google.com with SMTP id q16so4350440ead.35 for ; Tue, 13 Aug 2013 13:05:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LFFEUN4acmr2tdbXEMO8UO9eM2HCipsgxWO/iV6AmVM=; b=BZuv+Dl/dUf2bbJjuVJ5WDzl3NCvFB5xEEdS0ccD+M5RSl6lVV52zcRyaAP6WokcMq pn6uOJtWcV4lyxxwwOEz6lNFU5yjI2bD6u5j76by+mrZrk7b2aWhVVvErrWHEiBmSME7 yzLJbqOlJ/32lDIJEEjaReGaW5QDiBP5qo1eW+QZnyY1kz9ZbFVZ5xqq2WQZrf0rnrRo knRv8EcNlqsfzGldkwDWHsul+xKt3/MzaFkBcw4OcwgOe6jar5zkZawxewz7w2/c9Ddn v+a4og1Du6jVLzx85+bZ3/HN1MqjFO09mOlS49OGYTDi9WlwszQUIGAVLpLs+H5PMKGp OXMg== X-Received: by 10.15.23.1 with SMTP id g1mr28954eeu.110.1376424312840; Tue, 13 Aug 2013 13:05:12 -0700 (PDT) Received: from localhost.localdomain (cpc3-seac14-0-0-cust157.7-2.cable.virginmedia.com. [81.97.204.158]) by mx.google.com with ESMTPSA id bq1sm68985420eeb.9.2013.08.13.13.05.10 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 13 Aug 2013 13:05:11 -0700 (PDT) From: Zubair Lutfullah To: jic23@cam.ac.uk, dmitry.torokhov@gmail.com Cc: linux-iio@vger.kernel.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, bigeasy@linutronix.de, gregkh@linuxfoundation.org, Russ.Dill@ti.com Subject: [PATCH 3/4] input: ti_am335x_tsc: Enable shared IRQ for TSC, add overrun and underflow checks Date: Tue, 13 Aug 2013 21:05:02 +0100 Message-Id: <1376424303-22740-4-git-send-email-zubair.lutfullah@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1376424303-22740-1-git-send-email-zubair.lutfullah@gmail.com> References: <1376424303-22740-1-git-send-email-zubair.lutfullah@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Enable shared IRQ to allow ADC to share IRQ line from parent MFD core. Only FIFO0 IRQs are for TSC and handled on the TSC side. Patch also adds overrun and underflow irq handlers. Russ Dill (TI) worked on overrun and underflow handlers. Rachna Patil (TI) laid ground work for shared IRQ. Signed-off-by: Zubair Lutfullah Acked-by: Lee Jones --- drivers/input/touchscreen/ti_am335x_tsc.c | 37 +++++++++++++++++++++++++---- include/linux/mfd/ti_am335x_tscadc.h | 2 ++ 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c index 766bc7e..9c114b2 100644 --- a/drivers/input/touchscreen/ti_am335x_tsc.c +++ b/drivers/input/touchscreen/ti_am335x_tsc.c @@ -256,14 +256,39 @@ static irqreturn_t titsc_irq(int irq, void *dev) { struct titsc *ts_dev = dev; struct input_dev *input_dev = ts_dev->input; - unsigned int status, irqclr = 0; + unsigned int status, irqclr = 0, config = 0; unsigned int x = 0, y = 0; unsigned int z1, z2, z; unsigned int fsm; status = titsc_readl(ts_dev, REG_IRQSTATUS); - if (status & IRQENB_FIFO0THRES) { + /* + * ADC and touchscreen share the IRQ line. + * FIFO1 threshold, FIFO1 Overrun and FIFO1 underflow + * interrupts are used by ADC. Handle FIFO0 IRQs here only + * and check if any IRQs left in case both fifos interrupt. + * If any irq left, return none, else return handled. + */ + if ((status & IRQENB_FIFO0OVRRUN) || + (status & IRQENB_FIFO0UNDRFLW)) { + + config = titsc_readl(ts_dev, REG_CTRL); + config &= ~(CNTRLREG_TSCSSENB); + titsc_writel(ts_dev, REG_CTRL, config); + + if (status & IRQENB_FIFO0UNDRFLW) { + titsc_writel(ts_dev, REG_IRQSTATUS, + (status | IRQENB_FIFO0UNDRFLW)); + irqclr |= IRQENB_FIFO0UNDRFLW; + } else { + titsc_writel(ts_dev, REG_IRQSTATUS, + (status | IRQENB_FIFO0OVRRUN)); + irqclr |= IRQENB_FIFO0OVRRUN; + } + titsc_writel(ts_dev, REG_CTRL, + (config | CNTRLREG_TSCSSENB)); + } else if (status & IRQENB_FIFO0THRES) { titsc_read_coordinates(ts_dev, &x, &y, &z1, &z2); if (ts_dev->pen_down && z1 != 0 && z2 != 0) { @@ -317,9 +342,11 @@ static irqreturn_t titsc_irq(int irq, void *dev) } if (irqclr) { - titsc_writel(ts_dev, REG_IRQSTATUS, irqclr); + titsc_writel(ts_dev, REG_IRQSTATUS, (status | irqclr)); am335x_tsc_se_set(ts_dev->mfd_tscadc, ts_dev->step_mask); - return IRQ_HANDLED; + status = titsc_readl(ts_dev, REG_IRQSTATUS); + if (status == false) + return IRQ_HANDLED; } return IRQ_NONE; } @@ -391,7 +418,7 @@ static int titsc_probe(struct platform_device *pdev) } err = request_irq(ts_dev->irq, titsc_irq, - 0, pdev->dev.driver->name, ts_dev); + IRQF_SHARED, pdev->dev.driver->name, ts_dev); if (err) { dev_err(&pdev->dev, "failed to allocate irq.\n"); goto err_free_mem; diff --git a/include/linux/mfd/ti_am335x_tscadc.h b/include/linux/mfd/ti_am335x_tscadc.h index db1791b..e2db978 100644 --- a/include/linux/mfd/ti_am335x_tscadc.h +++ b/include/linux/mfd/ti_am335x_tscadc.h @@ -50,6 +50,8 @@ /* IRQ enable */ #define IRQENB_HW_PEN BIT(0) #define IRQENB_FIFO0THRES BIT(2) +#define IRQENB_FIFO0OVRRUN BIT(3) +#define IRQENB_FIFO0UNDRFLW BIT(4) #define IRQENB_FIFO1THRES BIT(5) #define IRQENB_PENUP BIT(9)