[ 18.476] (II) config/udev: Adding input device ft5x_ts (/dev/input/mouse0)
[ 18.476] (II) No input driver specified, ignoring this device.
[ 18.476] (II) This device may have been added with another device file.
[ 18.516] (II) config/udev: Adding input device ft5x_ts (/dev/input/event1)
[ 18.516] (**) ft5x_ts: Applying InputClass "evdev touchscreen catchall"
[ 18.516] (II) Using input driver 'evdev' for 'ft5x_ts'
[ 18.516] (II) Loading /usr/lib/xorg/modules/input/evdev_drv.so
[ 18.516] (**) ft5x_ts: always reports core events
[ 18.517] (**) evdev: ft5x_ts: Device: "/dev/input/event1"
[ 18.517] (--) evdev: ft5x_ts: Vendor 0 Product 0
[ 18.517] (--) evdev: ft5x_ts: Found absolute axes
[ 18.517] (--) evdev: ft5x_ts: Found absolute multitouch axes
[ 18.517] (--) evdev: ft5x_ts: Found x and y absolute axes
[ 18.517] (--) evdev: ft5x_ts: Found absolute touchscreen
[ 18.518] (II) evdev: ft5x_ts: Configuring as touchscreen
[ 18.518] (**) evdev: ft5x_ts: YAxisMapping: buttons 4 and 5
[ 18.518] (**) evdev: ft5x_ts: EmulateWheelButton: 4, EmulateWheelInertia: 10, EmulateWheelTimeout: 200
[ 18.518] (**) Option "config_info" "udev:/sys/devices/platform/sun4i-i2c.2/i2c-2/2-0038/input/input1/event1"
[ 18.518] (II) XINPUT: Adding extended input device "ft5x_ts" (type: TOUCHSCREEN, id 7)
[ 18.519] (II) evdev: ft5x_ts: initialized for absolute axes.
[ 18.561] (**) ft5x_ts: (accel) keeping acceleration scheme 1
[ 18.562] (**) ft5x_ts: (accel) acceleration profile 0
[ 18.562] (**) ft5x_ts: (accel) acceleration factor: 2.000
[ 18.562] (**) ft5x_ts: (accel) acceleration threshold: 4[ 21.029] (II) config/udev: Adding input device ft5x_ts (/dev/input/event1)
[ 21.029] (**) ft5x_ts: Applying InputClass "evdev touchscreen catchall"
[ 21.029] (II) Using input driver 'evdev' for 'ft5x_ts'
[ 21.029] (II) Loading /usr/lib/xorg/modules/input/evdev_drv.so
[ 21.029] (**) ft5x_ts: always reports core events
[ 21.029] (**) evdev: ft5x_ts: Device: "/dev/input/event1"
[ 21.029] (--) evdev: ft5x_ts: Vendor 0 Product 0
[ 21.029] (--) evdev: ft5x_ts: Found absolute axes
[ 21.030] (--) evdev: ft5x_ts: Found absolute multitouch axes
[ 21.030] (--) evdev: ft5x_ts: Found x and y absolute axes
[ 21.030] (--) evdev: ft5x_ts: Found absolute touchscreen
[ 21.030] (II) evdev: ft5x_ts: Configuring as touchscreen
[ 21.030] (**) evdev: ft5x_ts: YAxisMapping: buttons 4 and 5
[ 21.030] (**) evdev: ft5x_ts: EmulateWheelButton: 4, EmulateWheelInertia: 10, EmulateWheelTimeout: 200
[ 21.031] (**) Option "config_info" "udev:/sys/devices/platform/sun4i-i2c.2/i2c-2/2-0038/input/input1/event1"
[ 21.031] (II) XINPUT: Adding extended input device "ft5x_ts" (type: TOUCHSCREEN, id 7)
[ 21.032] (II) evdev: ft5x_ts: initialized for absolute axes.
[ 21.033] (**) ft5x_ts: (accel) keeping acceleration scheme 1
[ 21.033] (**) ft5x_ts: (accel) acceleration profile 0
[ 21.034] (**) ft5x_ts: (accel) acceleration factor: 2.000
[ 21.034] (**) ft5x_ts: (accel) acceleration threshold: 4
[ 21.036] (II) config/udev: Adding input device ft5x_ts (/dev/input/mouse0)
[ 21.036] (II) No input driver specified, ignoring this device.
[ 21.036] (II) This device may have been added with another device file.
---
drivers/input/touchscreen/ft5x_ts.c | 32 +++++++++++++++++---------------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/drivers/input/touchscreen/ft5x_ts.c b/drivers/input/touchscreen/ft5x_ts.c
index 4e14f65..e83cd06 100644
--- a/drivers/input/touchscreen/ft5x_ts.c
+++ b/drivers/input/touchscreen/ft5x_ts.c
@@ -1696,14 +1696,28 @@ ft5x_ts_probe(struct i2c_client *client, const struct i2c_device_id *id)
ft5x_ts->input_dev = input_dev;
+ set_bit(EV_ABS, input_dev->evbit);
+ set_bit(EV_KEY, input_dev->evbit);
+
+ set_bit(ABS_X, input_dev->absbit);
+ set_bit(ABS_Y, input_dev->absbit);
+ set_bit(ABS_PRESSURE, input_dev->absbit);
+
+ set_bit(BTN_TOUCH, input_dev->keybit);
+
+ input_set_abs_params(input_dev,
+ ABS_X, 0, SCREEN_MAX_X, 0, 0);
+ input_set_abs_params(input_dev,
+ ABS_Y, 0, SCREEN_MAX_Y, 0, 0);
+ input_set_abs_params(input_dev,
+ ABS_PRESSURE, 0, PRESS_MAX, 0 , 0);
+
#ifdef CONFIG_FT5X0X_MULTITOUCH
set_bit(ABS_MT_TOUCH_MAJOR, input_dev->absbit);
set_bit(ABS_MT_POSITION_X, input_dev->absbit);
set_bit(ABS_MT_POSITION_Y, input_dev->absbit);
set_bit(ABS_MT_WIDTH_MAJOR, input_dev->absbit);
-#ifdef FOR_TSLIB_TEST
- set_bit(BTN_TOUCH, input_dev->keybit);
-#endif
+
input_set_abs_params(input_dev,
ABS_MT_POSITION_X, 0, SCREEN_MAX_X, 0, 0);
input_set_abs_params(input_dev,
@@ -1720,20 +1734,8 @@ ft5x_ts_probe(struct i2c_client *client, const struct i2c_device_id *id)
for (i = 1; i < TOUCH_KEY_NUMBER; i++)
set_bit(i, input_dev->keybit);
#endif
-#else
- set_bit(ABS_X, input_dev->absbit);
- set_bit(ABS_Y, input_dev->absbit);
- set_bit(ABS_PRESSURE, input_dev->absbit);
- set_bit(BTN_TOUCH, input_dev->keybit);
- input_set_abs_params(input_dev, ABS_X, 0, SCREEN_MAX_X, 0, 0);
- input_set_abs_params(input_dev, ABS_Y, 0, SCREEN_MAX_Y, 0, 0);
- input_set_abs_params(input_dev,
- ABS_PRESSURE, 0, PRESS_MAX, 0 , 0);
#endif
- set_bit(EV_ABS, input_dev->evbit);
- set_bit(EV_KEY, input_dev->evbit);
-
input_dev->name = CTP_NAME; //dev_name(&client->dev)
input_dev->id.bustype = BUS_I2C;
input_dev->dev.parent = &client->dev;
--
1.7.9.5