diff options
| author | Troy Kisky <troy.kisky@boundarydevices.com> | 2012-07-03 17:04:57 -0700 |
|---|---|---|
| committer | Troy Kisky <troy.kisky@boundarydevices.com> | 2012-07-03 17:04:57 -0700 |
| commit | 2f0c84b3619deaaebeb3daa0166bed54bfdac190 (patch) | |
| tree | 121ecf51a8d628f9f9af642f859dcf8956a2d508 /drivers/input/touchscreen/egalax_ts.c | |
| parent | bfecaa2c2dc7583a42523c2ab136d21a97887289 (diff) | |
| parent | e06baef465e2ee37e286b264182d4a23f8f2c067 (diff) | |
Merge branch 'boundary-L3.0.15_12.04.01' of github.com:boundarydevices/linux-imx6 into boundary-L3.0.15_12.04.013.0-boundary-imx6-201207031704
Diffstat (limited to 'drivers/input/touchscreen/egalax_ts.c')
| -rw-r--r-- | drivers/input/touchscreen/egalax_ts.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/egalax_ts.c b/drivers/input/touchscreen/egalax_ts.c index fff8afe1b41a..0b6cde77c421 100644 --- a/drivers/input/touchscreen/egalax_ts.c +++ b/drivers/input/touchscreen/egalax_ts.c @@ -139,7 +139,7 @@ retry: events[id].x = x; events[id].y = y; -#ifdef FORCE_SINGLE_POINTER_SUPPORT +#ifdef CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH input_report_abs(input_dev, ABS_X, x); input_report_abs(input_dev, ABS_Y, y); input_event(data->input_dev, EV_KEY, BTN_TOUCH, 1); @@ -166,7 +166,7 @@ retry: dev_dbg(&client->dev, "release id:%d\n", id); events[id].valid = 0; events[id].status = 0; -#ifdef FORCE_SINGLE_POINTER_SUPPORT +#ifdef CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH input_report_key(input_dev, BTN_TOUCH, 0); input_report_abs(input_dev, ABS_PRESSURE, 0); #else @@ -256,8 +256,9 @@ static int __devinit egalax_ts_probe(struct i2c_client *client, __set_bit(ABS_PRESSURE, input_dev->absbit); input_set_abs_params(input_dev, ABS_X, 0, 32767, 0, 0); input_set_abs_params(input_dev, ABS_Y, 0, 32767, 0, 0); + input_set_abs_params(input_dev, ABS_PRESSURE, 0, 1, 0, 0); -#ifndef FORCE_SINGLE_POINTER_SUPPORT +#ifndef CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH input_set_abs_params(input_dev, ABS_MT_POSITION_X, 0, 32767, 0, 0); input_set_abs_params(input_dev, ABS_MT_POSITION_Y, 0, 32767, 0, 0); input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR, 0, 255, 0, 0); |