diff options
Diffstat (limited to 'drivers/input/touchscreen/edt-ft5x06.c')
-rw-r--r-- | drivers/input/touchscreen/edt-ft5x06.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c index d4c24fb7704f..e6aef3e48bd9 100644 --- a/drivers/input/touchscreen/edt-ft5x06.c +++ b/drivers/input/touchscreen/edt-ft5x06.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include <linux/gpio.h> | 37 | #include <linux/gpio.h> |
38 | #include <linux/of_gpio.h> | 38 | #include <linux/of_gpio.h> |
39 | #include <linux/input/mt.h> | 39 | #include <linux/input/mt.h> |
40 | #include <linux/input/touchscreen.h> | ||
40 | #include <linux/input/edt-ft5x06.h> | 41 | #include <linux/input/edt-ft5x06.h> |
41 | 42 | ||
42 | #define MAX_SUPPORT_POINTS 5 | 43 | #define MAX_SUPPORT_POINTS 5 |
@@ -1034,7 +1035,6 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client, | |||
1034 | input->id.bustype = BUS_I2C; | 1035 | input->id.bustype = BUS_I2C; |
1035 | input->dev.parent = &client->dev; | 1036 | input->dev.parent = &client->dev; |
1036 | 1037 | ||
1037 | __set_bit(EV_SYN, input->evbit); | ||
1038 | __set_bit(EV_KEY, input->evbit); | 1038 | __set_bit(EV_KEY, input->evbit); |
1039 | __set_bit(EV_ABS, input->evbit); | 1039 | __set_bit(EV_ABS, input->evbit); |
1040 | __set_bit(BTN_TOUCH, input->keybit); | 1040 | __set_bit(BTN_TOUCH, input->keybit); |
@@ -1044,6 +1044,10 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client, | |||
1044 | 0, tsdata->num_x * 64 - 1, 0, 0); | 1044 | 0, tsdata->num_x * 64 - 1, 0, 0); |
1045 | input_set_abs_params(input, ABS_MT_POSITION_Y, | 1045 | input_set_abs_params(input, ABS_MT_POSITION_Y, |
1046 | 0, tsdata->num_y * 64 - 1, 0, 0); | 1046 | 0, tsdata->num_y * 64 - 1, 0, 0); |
1047 | |||
1048 | if (!pdata) | ||
1049 | touchscreen_parse_of_params(input); | ||
1050 | |||
1047 | error = input_mt_init_slots(input, MAX_SUPPORT_POINTS, 0); | 1051 | error = input_mt_init_slots(input, MAX_SUPPORT_POINTS, 0); |
1048 | if (error) { | 1052 | if (error) { |
1049 | dev_err(&client->dev, "Unable to init MT slots.\n"); | 1053 | dev_err(&client->dev, "Unable to init MT slots.\n"); |