Input: tsc2007 - switch to using input_set_capability()
Subsystems (2)
Dmitry Torokhov
maintainerPATCH 1/1 Input: tsc2007 - switch to using input_set_capability()
Do not manipulate evbit/keybit directly, use helper for that.
--- drivers/input/touchscreen/tsc2007_core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/input/touchscreen/tsc2007_core.c +1 -2
@@ -364,8 +364,7 @@ static int tsc2007_probe(struct i2c_client *client,input_set_drvdata (input_dev, ts); - input_dev->evbit[0 ] =BIT_MASK (EV_KEY ) |BIT_MASK (EV_ABS ); - input_dev->keybit[BIT_WORD (BTN_TOUCH )] =BIT_MASK (BTN_TOUCH ); +input_set_capability (input_dev,EV_KEY ,BTN_TOUCH );input_set_abs_params (input_dev,ABS_X ,0 ,MAX_12BIT , ts->fuzzx,0 );input_set_abs_params (input_dev,ABS_Y ,0 ,MAX_12BIT , ts->fuzzy,0 );
Signature · 5 lines
2.11.0.483.g087da7b7c-goog -- Dmitry
Hi Dmitry,
Quoted 14 lines
Am 17.02.2017 um 23:56 schrieb Dmitry Torokhov <[email protected]>:
Do not manipulate evbit/keybit directly, use helper for that.
Signed-off-by Dmitry Torokhov <[email protected]>---
drivers/input/touchscreen/tsc2007_core.c| 3 +--1 file changed, 1 insertion(+), 2 deletions(-)drivers/input/touchscreen/tsc2007_core.c +0
-0
drivers/input/touchscreen/tsc2007_core.c static int tsc2007_probe(struct i2c_client *client, · line 367
Quoted 6 lines
drivers/input/touchscreen/tsc2007_core.c +1
-2@@ -364,8 +364,7 @@ static int tsc2007_probe(struct i2c_client *client,input_set_drvdata (input_dev, ts); - input_dev->evbit[0 ] =BIT_MASK (EV_KEY ) |BIT_MASK (EV_ABS ); - input_dev->keybit[BIT_WORD (BTN_TOUCH )] =BIT_MASK (BTN_TOUCH ); +input_set_capability (input_dev,EV_KEY ,BTN_TOUCH );
basically a good improvement, but removing the BIT_MASK(EV_ABS) makes problems when replacing the next lines
drivers/input/touchscreen/tsc2007_core.c static int tsc2007_probe(struct i2c_client *client, · line 370
Quoted 3 lines
drivers/input/touchscreen/tsc2007_core.c +0
-0input_set_abs_params (input_dev,ABS_X ,0 ,MAX_12BIT , ts->fuzzx,0 );input_set_abs_params (input_dev,ABS_Y ,0 ,MAX_12BIT , ts->fuzzy,0 );
by touchscreen_parse_properties() as done by my patch set.
The problem is that touchscreen_parse_properties() does not call input_set_abs_params() but touchscreen_set_params(). This does not call some input_set_capability(dev, EV_ABS, axis) but rather checks that it has been set before! Hence we only see warnings in the log and no input event properties (BTN_TOUCH works but without position information).
So we either must explicitly input_set_capability(dev, EV_ABS, axis) for all three axises or remove the test in touchscreen_set_params and call input_set_capability(dev, EV_ABS, axis); in the end.
This patch improves the existing driver but breaks my tsc2007 patch set in a location that my patch set does not even touch (touchscreen_set_params).
Scratching my head how to come out of this...
BR and thanks,
Nikolaus
Dmitry Torokhov
maintainerQuoted 30 lines · H. Nikolaus Schaller
Hi Dmitry,
Quoted 14 lines
Am 17.02.2017 um 23:56 schrieb Dmitry Torokhov <[email protected]>:
Do not manipulate evbit/keybit directly, use helper for that.
Signed-off-by Dmitry Torokhov <[email protected]>---
drivers/input/touchscreen/tsc2007_core.c| 3 +--1 file changed, 1 insertion(+), 2 deletions(-)drivers/input/touchscreen/tsc2007_core.c +0
-0drivers/input/touchscreen/tsc2007_core.c static int tsc2007_probe(struct i2c_client *client, · line 367
Quoted 6 lines
drivers/input/touchscreen/tsc2007_core.c +1
-2@@ -364,8 +364,7 @@ static int tsc2007_probe(struct i2c_client *client,input_set_drvdata (input_dev, ts); - input_dev->evbit[0 ] =BIT_MASK (EV_KEY ) |BIT_MASK (EV_ABS ); - input_dev->keybit[BIT_WORD (BTN_TOUCH )] =BIT_MASK (BTN_TOUCH ); +input_set_capability (input_dev,EV_KEY ,BTN_TOUCH );basically a good improvement, but removing the
BIT_MASK(EV_ABS)makes problems when replacing the next linesdrivers/input/touchscreen/tsc2007_core.c static int tsc2007_probe(struct i2c_client *client, · line 370
Quoted 3 lines
drivers/input/touchscreen/tsc2007_core.c +0
-0input_set_abs_params (input_dev,ABS_X ,0 ,MAX_12BIT , ts->fuzzx,0 );input_set_abs_params (input_dev,ABS_Y ,0 ,MAX_12BIT , ts->fuzzy,0 );
Quoted 8 lines
by
touchscreen_parse_properties()as done by my patch set.The problem is that
touchscreen_parse_properties()does not callinput_set_abs_params()buttouchscreen_set_params(). This does not call someinput_set_capability(dev, EV_ABS, axis)but rather checks that it has been set before! Hence we only see warnings in the log and no input event properties (BTN_TOUCHworks but without position information).
Yes, the driver is supposed to set defaults, then OF data may augment them (or it may omit them and leave driver's defaults). You should not have removed calls to
input_set_abs_params(input_dev, ABS_X, 0, MAX_12BIT, ts->fuzzx, 0);
We may end up setting initial fuzz to 0, that's fine.
Thanks.
Signature · 1 line
Dmitry
Hi Dmitry,
Quoted 42 lines
Am 20.02.2017 um 02:10 schrieb Dmitry Torokhov <[email protected]>:
Quoted 30 lines · H. Nikolaus Schaller
Hi Dmitry,
Quoted 14 lines
Am 17.02.2017 um 23:56 schrieb Dmitry Torokhov <[email protected]>:
Do not manipulate evbit/keybit directly, use helper for that.
Signed-off-by Dmitry Torokhov <[email protected]>---
drivers/input/touchscreen/tsc2007_core.c| 3 +--1 file changed, 1 insertion(+), 2 deletions(-)drivers/input/touchscreen/tsc2007_core.c +0
-0drivers/input/touchscreen/tsc2007_core.c static int tsc2007_probe(struct i2c_client *client, · line 367
Quoted 6 lines
drivers/input/touchscreen/tsc2007_core.c +1
-2@@ -364,8 +364,7 @@ static int tsc2007_probe(struct i2c_client *client,input_set_drvdata (input_dev, ts); - input_dev->evbit[0 ] =BIT_MASK (EV_KEY ) |BIT_MASK (EV_ABS ); - input_dev->keybit[BIT_WORD (BTN_TOUCH )] =BIT_MASK (BTN_TOUCH ); +input_set_capability (input_dev,EV_KEY ,BTN_TOUCH );basically a good improvement, but removing the
BIT_MASK(EV_ABS)makes problems when replacing the next linesdrivers/input/touchscreen/tsc2007_core.c static int tsc2007_probe(struct i2c_client *client, · line 370
Quoted 3 lines
drivers/input/touchscreen/tsc2007_core.c +0
-0input_set_abs_params (input_dev,ABS_X ,0 ,MAX_12BIT , ts->fuzzx,0 );input_set_abs_params (input_dev,ABS_Y ,0 ,MAX_12BIT , ts->fuzzy,0 );Quoted 8 lines
by
touchscreen_parse_properties()as done by my patch set.The problem is that
touchscreen_parse_properties()does not callinput_set_abs_params()buttouchscreen_set_params(). This does not call someinput_set_capability(dev, EV_ABS, axis)but rather checks that it has been set before! Hence we only see warnings in the log and no input event properties (BTN_TOUCHworks but without position information).
Quoted 2 lines
Yes, the driver is supposed to set defaults, then OF data may augment them (or it may omit them and leave driver's defaults).
Ok.
Quoted 4 lines
You should not
have removed calls toinput_set_abs_params(input_dev, ABS_X, 0, MAX_12BIT, ts->fuzzx, 0);
Wouldn't it suffice to call
input_set_capability(input_dev, EV_ABS, ABS_X); input_set_capability(input_dev, EV_ABS, ABS_Y);
since fuzz default is already 0?
BR,
Nikolaus