From patchwork Thu Feb 10 08:03:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iiro Valkonen X-Patchwork-Id: 545481 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1A8324X019218 for ; Thu, 10 Feb 2011 08:03:02 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752618Ab1BJIDB (ORCPT ); Thu, 10 Feb 2011 03:03:01 -0500 Received: from newsmtp5.atmel.com ([204.2.163.5]:40463 "EHLO sjogate2.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752603Ab1BJIDB (ORCPT ); Thu, 10 Feb 2011 03:03:01 -0500 Received: from csomb01.corp.atmel.com ([10.95.30.150]) by sjogate2.atmel.com (8.13.6/8.13.6) with ESMTP id p1A80I1j003137; Thu, 10 Feb 2011 00:00:18 -0800 (PST) Received: from hammb01.corp.atmel.com ([10.142.130.20]) by csomb01.corp.atmel.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 10 Feb 2011 01:02:58 -0700 Received: from [10.191.100.77] ([10.191.100.77]) by hammb01.corp.atmel.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 10 Feb 2011 08:02:56 +0000 Message-ID: <4D539BD6.6010007@atmel.com> Date: Thu, 10 Feb 2011 10:03:34 +0200 From: Iiro Valkonen User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.13) Gecko/20101208 Thunderbird/3.1.7 MIME-Version: 1.0 To: Dmitry Torokhov CC: Trilok Soni , linux-input@vger.kernel.org Subject: Re: [PATCH 4/5] Try IRQF_TRIGGER_NONE if IRQF_TRIGGER_FALLING returns error References: <4D3DAE3C.6060806@atmel.com> <20110124170756.GB31066@core.coreip.homeip.net> <4D3EA7DD.6000601@atmel.com> <20110203074318.GA5814@core.coreip.homeip.net> <4D4AB770.7090407@atmel.com> <20110204085336.GC13046@core.coreip.homeip.net> In-Reply-To: <20110204085336.GC13046@core.coreip.homeip.net> X-OriginalArrivalTime: 10 Feb 2011 08:02:56.0449 (UTC) FILETIME=[ED09FB10:01CBC8F8] Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 10 Feb 2011 08:03:02 +0000 (UTC) diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c index e22d511..cb6a637 100644 --- a/arch/arm/mach-s5pv210/mach-goni.c +++ b/arch/arm/mach-s5pv210/mach-goni.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -231,6 +232,7 @@ static struct qt602240_platform_data qt602240_platform_data = { .threshold = 0x28, .voltage = 2800000, /* 2.8V */ .orient = QT602240_DIAGONAL, + .irqflags = IRQF_TRIGGER_FALLING, }; static struct s3c2410_platform_i2c i2c2_data __initdata = { diff --git a/drivers/input/touchscreen/qt602240_ts.c b/drivers/input/touchscreen/qt602240_ts.c index 115dcc4..08fd136 100644 --- a/drivers/input/touchscreen/qt602240_ts.c +++ b/drivers/input/touchscreen/qt602240_ts.c @@ -1162,7 +1162,7 @@ static int __devinit mxt_probe(struct i2c_client *client, goto err_free_object; error = request_threaded_irq(client->irq, NULL, mxt_interrupt, - IRQF_TRIGGER_FALLING, client->dev.driver->name, data); + pdata->irqflags, client->dev.driver->name, data); if (error) { dev_err(&client->dev, "Failed to register interrupt\n"); goto err_free_object; diff --git a/include/linux/i2c/qt602240_ts.h b/include/linux/i2c/qt602240_ts.h index 219392a..550f2a8 100644 --- a/include/linux/i2c/qt602240_ts.h +++ b/include/linux/i2c/qt602240_ts.h @@ -35,6 +35,7 @@ struct mxt_platform_data { unsigned char orient; const u8 *config; unsigned int config_length; + unsigned long irqflags; }; #endif /* __LINUX_MAXTOUCH_TS_H */