From: Ben Dooks <ben-linux@fluff.org>
To: linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org
Cc: kgene.kim@samsung.com, ch.naveen@samsubng.com,
dmitry.torokhov@gmail.com, Naveen Krishna <ch.naveen@samsung.com>,
Ben Dooks <ben-linux@fluff.org>
Subject: [PATCH 6/8] Input: s3c24xx_ts - Add FEAT for Samsung touchscreen support
Date: Wed, 19 May 2010 07:12:20 +0100 [thread overview]
Message-ID: <1274249542-28795-7-git-send-email-ben-linux@fluff.org> (raw)
In-Reply-To: <1274249542-28795-1-git-send-email-ben-linux@fluff.org>
From: Naveen Krishna <ch.naveen@samsung.com>
This patch adds a feature bit field in the touchscreen driver for Samsung SoCs.
Which can be used to distinguish the TSADC module features.
Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
[ben-linux@fluff.org: minor fix to title]
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
---
drivers/input/touchscreen/s3c2410_ts.c | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
index 86086a4..e0b7c83 100644
--- a/drivers/input/touchscreen/s3c2410_ts.c
+++ b/drivers/input/touchscreen/s3c2410_ts.c
@@ -55,6 +55,8 @@
S3C2410_ADCTSC_AUTO_PST | \
S3C2410_ADCTSC_XY_PST(0))
+#define FEAT_PEN_IRQ (1 << 0) /* HAS ADCCLRINTPNDNUP */
+
/* Per-touchscreen data. */
/**
@@ -69,6 +71,7 @@
* @irq_tc: The interrupt number for pen up/down interrupt
* @count: The number of samples collected.
* @shift: The log2 of the maximum count to read in one go.
+ * @features: The features supported by the TSADC MOdule.
*/
struct s3c2410ts {
struct s3c_adc_client *client;
@@ -81,6 +84,7 @@ struct s3c2410ts {
int irq_tc;
int count;
int shift;
+ int features;
};
static struct s3c2410ts ts;
@@ -171,6 +175,11 @@ static irqreturn_t stylus_irq(int irq, void *dev_id)
else
dev_info(ts.dev, "%s: count=%d\n", __func__, ts.count);
+ if (ts.features & FEAT_PEN_IRQ) {
+ /* Clear pen down/up interrupt */
+ writel(0x0, ts.io + S3C64XX_ADCCLRINTPNDNUP);
+ }
+
return IRQ_HANDLED;
}
@@ -317,6 +326,7 @@ static int __devinit s3c2410ts_probe(struct platform_device *pdev)
ts.input->id.version = 0x0102;
ts.shift = info->oversampling_shift;
+ ts.features = platform_get_device_id(pdev)->driver_data;
ret = request_irq(ts.irq_tc, stylus_irq, IRQF_DISABLED,
"s3c2410_ts_pen", ts.input);
@@ -403,15 +413,14 @@ static struct dev_pm_ops s3c_ts_pmops = {
#endif
static struct platform_device_id s3cts_driver_ids[] = {
- { "s3c2410-ts", 0 },
- { "s3c2440-ts", 1 },
+ { "s3c64xx-ts", FEAT_PEN_IRQ },
{ }
};
MODULE_DEVICE_TABLE(platform, s3cts_driver_ids);
static struct platform_driver s3c_ts_driver = {
.driver = {
- .name = "s3c24xx-ts",
+ .name = "samsung-ts",
.owner = THIS_MODULE,
#ifdef CONFIG_PM
.pm = &s3c_ts_pmops,
--
1.6.3.3
next prev parent reply other threads:[~2010-05-19 6:12 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-19 6:12 Samsung touchscreen updates Ben Dooks
2010-05-19 6:12 ` [PATCH 1/8] ARM: SAMSUNG: Move mach/ts.h to plat/ts.h Ben Dooks
2010-05-19 6:12 ` [PATCH 2/8] ARM: S3C64XX: Add touchscreen platform device definition Ben Dooks
2010-05-19 6:12 ` [PATCH 3/8] ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen Ben Dooks
2010-05-19 6:12 ` [PATCH 4/8] ARM: SAMSUNG: Move s3c64xx dev-ts.c to plat-samsung and rename configuration Ben Dooks
2010-05-19 6:12 ` [PATCH 5/8] Input: s3c24xx_ts - Implement generic GPIO configuration callback Ben Dooks
2010-05-19 6:12 ` Ben Dooks [this message]
2010-05-26 21:41 ` [PATCH 6/8] Input: s3c24xx_ts - Add FEAT for Samsung touchscreen support Vasily Khoruzhick
2010-05-19 6:12 ` [PATCH 7/8] Input: s3c24xx_ts - depend on SAMSUNG_DEV_TS and update menu entry Ben Dooks
2010-05-19 6:12 ` [PATCH 8/8] Input: s3c24xx_ts - fix selection of S3C_ADC Ben Dooks
2010-05-19 6:34 ` Samsung touchscreen updates Dmitry Torokhov
2010-05-19 6:41 ` Ben Dooks
2010-05-20 7:15 ` Dmitry Torokhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1274249542-28795-7-git-send-email-ben-linux@fluff.org \
--to=ben-linux@fluff.org \
--cc=ch.naveen@samsubng.com \
--cc=ch.naveen@samsung.com \
--cc=dmitry.torokhov@gmail.com \
--cc=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-input@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).