diff options
| author | Jochen Friedrich <jochen@scram.de> | 2011-01-30 07:40:56 -0500 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-03-23 05:41:45 -0400 |
| commit | de8c8b0683043e81d2001e446f2bcb143affb0b2 (patch) | |
| tree | 732fa925ec53b0c0477a0fc923ecda4345fd0b10 | |
| parent | ce5d4a435af2839771210aeda2b649f5a183b63c (diff) | |
mfd: Add BTN_TOUCH event to ucb1x00-ts
Add BTN_TOUCH event reporting to ucb1x00_ts touchscreen driver.
This will make this touchscreen driver behave consistently wrt.
BTN_TOUCH.
Signed-off-by: Jochen Friedrich <jochen@scram.de>
Acked-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| -rw-r--r-- | drivers/mfd/ucb1x00-ts.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c index 92b85e28a15e..38ffbd50a0d2 100644 --- a/drivers/mfd/ucb1x00-ts.c +++ b/drivers/mfd/ucb1x00-ts.c | |||
| @@ -60,6 +60,7 @@ static inline void ucb1x00_ts_evt_add(struct ucb1x00_ts *ts, u16 pressure, u16 x | |||
| 60 | input_report_abs(idev, ABS_X, x); | 60 | input_report_abs(idev, ABS_X, x); |
| 61 | input_report_abs(idev, ABS_Y, y); | 61 | input_report_abs(idev, ABS_Y, y); |
| 62 | input_report_abs(idev, ABS_PRESSURE, pressure); | 62 | input_report_abs(idev, ABS_PRESSURE, pressure); |
| 63 | input_report_key(idev, BTN_TOUCH, 1); | ||
| 63 | input_sync(idev); | 64 | input_sync(idev); |
| 64 | } | 65 | } |
| 65 | 66 | ||
| @@ -68,6 +69,7 @@ static inline void ucb1x00_ts_event_release(struct ucb1x00_ts *ts) | |||
| 68 | struct input_dev *idev = ts->idev; | 69 | struct input_dev *idev = ts->idev; |
| 69 | 70 | ||
| 70 | input_report_abs(idev, ABS_PRESSURE, 0); | 71 | input_report_abs(idev, ABS_PRESSURE, 0); |
| 72 | input_report_key(idev, BTN_TOUCH, 0); | ||
| 71 | input_sync(idev); | 73 | input_sync(idev); |
| 72 | } | 74 | } |
| 73 | 75 | ||
| @@ -384,7 +386,8 @@ static int ucb1x00_ts_add(struct ucb1x00_dev *dev) | |||
| 384 | idev->open = ucb1x00_ts_open; | 386 | idev->open = ucb1x00_ts_open; |
| 385 | idev->close = ucb1x00_ts_close; | 387 | idev->close = ucb1x00_ts_close; |
| 386 | 388 | ||
| 387 | __set_bit(EV_ABS, idev->evbit); | 389 | idev->evbit[0] = BIT_MASK(EV_ABS) | BIT_MASK(EV_KEY); |
| 390 | idev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH); | ||
| 388 | 391 | ||
| 389 | input_set_drvdata(idev, ts); | 392 | input_set_drvdata(idev, ts); |
| 390 | 393 | ||
