From 969e7b38aa18dd21e317e2ef32042862b231fc27 Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Tue, 17 May 2011 09:32:02 -0700 Subject: [PATCH] --- yaml --- r: 250524 b: refs/heads/master c: 1af38eac8cdb70dbad3086b4f1bf7296eb1b09b1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/touchscreen/tsc2007.c | 6 +++--- trunk/include/linux/i2c/tsc2007.h | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 24caa7a04974..e84881df5f51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d137c7ed25f9754f52495af570897ad993e4fe7 +refs/heads/master: 1af38eac8cdb70dbad3086b4f1bf7296eb1b09b1 diff --git a/trunk/drivers/input/touchscreen/tsc2007.c b/trunk/drivers/input/touchscreen/tsc2007.c index faa82ddb014b..87c40c79f71e 100644 --- a/trunk/drivers/input/touchscreen/tsc2007.c +++ b/trunk/drivers/input/touchscreen/tsc2007.c @@ -27,8 +27,6 @@ #include #include -#define TS_POLL_PERIOD 1 /* ms delay between samples */ - #define TSC2007_MEASURE_TEMP0 (0x0 << 4) #define TSC2007_MEASURE_AUX (0x2 << 4) #define TSC2007_MEASURE_TEMP1 (0x4 << 4) @@ -76,6 +74,7 @@ struct tsc2007 { u16 x_plate_ohms; u16 max_rt; unsigned long poll_delay; + unsigned long poll_period; bool pendown; int irq; @@ -230,7 +229,7 @@ static void tsc2007_work(struct work_struct *work) out: if (ts->pendown || debounced) schedule_delayed_work(&ts->work, - msecs_to_jiffies(TS_POLL_PERIOD)); + msecs_to_jiffies(ts->poll_period)); else enable_irq(ts->irq); } @@ -297,6 +296,7 @@ static int __devinit tsc2007_probe(struct i2c_client *client, ts->x_plate_ohms = pdata->x_plate_ohms; ts->max_rt = pdata->max_rt ? : MAX_12BIT; ts->poll_delay = pdata->poll_delay ? : 1; + ts->poll_period = pdata->poll_period ? : 1; ts->get_pendown_state = pdata->get_pendown_state; ts->clear_penirq = pdata->clear_penirq; diff --git a/trunk/include/linux/i2c/tsc2007.h b/trunk/include/linux/i2c/tsc2007.h index 342b130a0a98..a51dac081aca 100644 --- a/trunk/include/linux/i2c/tsc2007.h +++ b/trunk/include/linux/i2c/tsc2007.h @@ -9,6 +9,7 @@ struct tsc2007_platform_data { u16 max_rt; /* max. resistance above which samples are ignored */ unsigned long poll_delay; /* delay (in ms) after pen-down event before polling starts */ + unsigned long poll_period; /* time (in ms) between samples */ int (*get_pendown_state)(void); void (*clear_penirq)(void); /* If needed, clear 2nd level