Input: ili210x - do not retrieve/print chip firmware version
Subsystems (2)
PATCH 1/3 Input: ili210x - do not retrieve/print chip firmware version
The driver's method to retrieve the firmware version on ili2117/ ili2118 chip flavours is incorrect. The firmware version register address and layout are wrong.
The firmware version is not actually used anywhere inside or outside this driver. There is a dev_dbg() print, but that is only visible when the developer explicitly compiles in debug support.
Don't make the code more complicated to preserve a feature that no-one is using. Remove all code associated with chip firmware version.
Tree: https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git/log/?h=next
--- drivers/input/touchscreen/ili210x.c | 21 --------------------- 1 file changed, 21 deletions(-)
drivers/input/touchscreen/ili210x.c +0 -21
@@ -21,15 +21,8 @@/* Touchscreen commands */ #define REG_TOUCHDATA 0x10#define REG_PANEL_INFO 0x20 -#define REG_FIRMWARE_VERSION 0x40#define REG_CALIBRATE 0xcc -struct firmware_version { -u8 id; -u8 major; -u8 minor; -} __packed; -struct ili2xxx_chip {int (*read_reg)(struct i2c_client *client,u8 reg,void *buf,size_t len);
@@ -342,7 +335,6 @@ static int ili210x_i2c_probe(struct i2c_client *client,struct ili210x *priv;struct gpio_desc *reset_gpio;struct input_dev *input; -struct firmware_version firmware;int error;dev_dbg (dev,"Probing for ILI210X I2C Touschreen driver" );
@@ -389,15 +381,6 @@ static int ili210x_i2c_probe(struct i2c_client *client, priv->chip = chip;i2c_set_clientdata (client, priv); -/* Get firmware version */ - error = chip->read_reg (client,REG_FIRMWARE_VERSION , - &firmware,sizeof (firmware)); -if (error) { -dev_err (dev,"Failed to get firmware version, err: %d\n" , - error); -return error; - } -/* Setup input device */ input->name ="ILI210x Touchscreen" ; input->id.bustype =BUS_I2C ;
@@ -439,10 +422,6 @@ static int ili210x_i2c_probe(struct i2c_client *client,return error; } -dev_dbg (dev, -"ILI210x initialized (IRQ: %d), firmware version %d.%d.%d" , - client->irq, firmware.id, firmware.major, firmware.minor); -return 0 ; }
Signature · 1 line
2.17.1
PATCH 2/3 Input: ili210x - add resolution to chip operations structure
Optionally allow the touch screen resolution to be set by adding it to the chip operations structure. If it is omitted (left zero), the resolution defaults to 64K. Which is the previously hard-coded value.
Set the ili2117 resolution to 2048, as indicated in its datasheet.
Tree: https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git/log/?h=next
--- drivers/input/touchscreen/ili210x.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/input/touchscreen/ili210x.c +9 -2
@@ -31,6 +31,7 @@ struct ili2xxx_chip { unsigned int *x, unsigned int *y);bool (*continue_polling)(const u8 *data,bool touch);unsigned int max_touches; +unsigned int resolution; };struct ili210x {
@@ -160,6 +161,7 @@ static const struct ili2xxx_chip ili211x_chip = { .parse_touch_data = ili211x_touchdata_to_coords, .continue_polling = ili211x_decline_polling, .max_touches = 10, + .resolution = 2048, }; static int ili251x_read_reg(struct i2c_client *client,
@@ -336,6 +338,7 @@ static int ili210x_i2c_probe(struct i2c_client *client,struct gpio_desc *reset_gpio;struct input_dev *input;int error; +unsigned int max_xy;dev_dbg (dev,"Probing for ILI210X I2C Touschreen driver" );
@@ -386,8 +389,12 @@ static int ili210x_i2c_probe(struct i2c_client *client, input->id.bustype =BUS_I2C ;/* Multi touch */ -input_set_abs_params (input,ABS_MT_POSITION_X ,0 ,0xffff ,0 ,0 ); -input_set_abs_params (input,ABS_MT_POSITION_Y ,0 ,0xffff ,0 ,0 ); +if (chip->resolution) + max_xy = chip->resolution -1 ; +else + max_xy =0xffff ; +input_set_abs_params (input,ABS_MT_POSITION_X ,0 , max_xy,0 ,0 ); +input_set_abs_params (input,ABS_MT_POSITION_Y ,0 , max_xy,0 ,0 );touchscreen_parse_properties (input, true, &priv->prop); error = input_mt_init_slots(input, priv->chip->max_touches,
Signature · 1 line
2.17.1
Dmitry Torokhov
maintainerRe: [PATCH v1 2/3] Input: ili210x - add resolution to chip operations structure
Quoted 47 lines · Sven Van Asbroeck
Optionally allow the touch screen resolution to be set by adding it to the chip operations structure. If it is omitted (left zero), the resolution defaults to 64K. Which is the previously hard-coded value.
Set the ili2117 resolution to 2048, as indicated in its datasheet.
Tree: https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git/log/?h=next
Signed-off-by Sven Van Asbroeck <[email protected]>--- drivers/input/touchscreen/ili210x.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)drivers/input/touchscreen/ili210x.c +3
-0@@ -31,6 +31,7 @@ struct ili2xxx_chip { unsigned int *x, unsigned int *y);bool (*continue_polling)(const u8 *data,bool touch);unsigned int max_touches; +unsigned int resolution; };struct ili210x {@@ -160,6 +161,7 @@ static const struct ili2xxx_chip ili211x_chip = { .parse_touch_data = ili211x_touchdata_to_coords, .continue_polling = ili211x_decline_polling, .max_touches = 10, + .resolution = 2048, }; static int ili251x_read_reg(struct i2c_client *client,@@ -336,6 +338,7 @@ static int ili210x_i2c_probe(struct i2c_client *client,struct gpio_desc *reset_gpio;struct input_dev *input;int error; +unsigned int max_xy;dev_dbg (dev,"Probing for ILI210X I2C Touschreen driver" );
drivers/input/touchscreen/ili210x.c static int ili210x_i2c_probe(struct i2c_client *client, · line 395
Quoted 9 lines
drivers/input/touchscreen/ili210x.c +4
-2@@ -386,8 +389,12 @@ static int ili210x_i2c_probe(struct i2c_client *client, input->id.bustype =BUS_I2C ;/* Multi touch */ -input_set_abs_params (input,ABS_MT_POSITION_X ,0 ,0xffff ,0 ,0 ); -input_set_abs_params (input,ABS_MT_POSITION_Y ,0 ,0xffff ,0 ,0 ); +if (chip->resolution) + max_xy = chip->resolution -1 ; +else + max_xy =0xffff ;
max_xy = (chip->resolution ?: 65536) - 1;
Quoted 8 lines
drivers/input/touchscreen/ili210x.c +2
-0+input_set_abs_params (input,ABS_MT_POSITION_X ,0 , max_xy,0 ,0 ); +input_set_abs_params (input,ABS_MT_POSITION_Y ,0 , max_xy,0 ,0 );touchscreen_parse_properties (input, true, &priv->prop); error = input_mt_init_slots(input, priv->chip->max_touches,Signature · 1 line
2.17.1
Signature · 1 line
Dmitry
PATCH 3/3 Input: ili210x - optionally hide calibrate sysfs attribute
In reply to Sven Van AsbroeckOnly show the 'calibrate' sysfs attribute on chip flavours which support calibration by writing to a calibration register.
Do this by adding a flag to the chip operations structure.
Tree: https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git/log/?h=next
--- drivers/input/touchscreen/ili210x.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/input/touchscreen/ili210x.c +13 -0
@@ -32,6 +32,7 @@ struct ili2xxx_chip {bool (*continue_polling)(const u8 *data,bool touch);unsigned int max_touches;unsigned int resolution; +bool no_calibrate_reg; };struct ili210x {
@@ -162,6 +163,7 @@ static const struct ili2xxx_chip ili211x_chip = { .continue_polling = ili211x_decline_polling, .max_touches = 10, .resolution = 2048, + .no_calibrate_reg = true, }; static int ili251x_read_reg(struct i2c_client *client,
@@ -310,8 +312,19 @@ static struct attribute *ili210x_attributes[] = { NULL, }; +static umode_t ili210x_calibrate_visible (struct kobject *kobj, +struct attribute *attr,int index) +{ +struct device *dev =kobj_to_dev (kobj); +struct i2c_client *client =to_i2c_client (dev); +struct ili210x *priv =i2c_get_clientdata (client); + +return !priv->chip->no_calibrate_reg; +} +static const struct attribute_group ili210x_attr_group = { .attrs = ili210x_attributes, + .is_visible = ili210x_calibrate_visible, };static void ili210x_power_down (void *data)
Signature · 1 line
2.17.1
Dmitry Torokhov
maintainerRe: [PATCH v1 3/3] Input: ili210x - optionally hide calibrate sysfs attribute
Quoted 21 lines · Sven Van Asbroeck
Only show the 'calibrate' sysfs attribute on chip flavours which support calibration by writing to a calibration register.
Do this by adding a flag to the chip operations structure.
Tree: https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git/log/?h=next
Signed-off-by Sven Van Asbroeck <[email protected]>--- drivers/input/touchscreen/ili210x.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)drivers/input/touchscreen/ili210x.c +0
-0
drivers/input/touchscreen/ili210x.c struct ili2xxx_chip { · line 35
Quoted 4 lines
drivers/input/touchscreen/ili210x.c +1
-0@@ -32,6 +32,7 @@ struct ili2xxx_chip {bool (*continue_polling)(const u8 *data,bool touch);unsigned int max_touches;unsigned int resolution; +bool no_calibrate_reg;
Please use positive logic and have chips opt-in into the calibration.
Quoted 34 lines
drivers/input/touchscreen/ili210x.c +12
-0};struct ili210x {@@ -162,6 +163,7 @@ static const struct ili2xxx_chip ili211x_chip = { .continue_polling = ili211x_decline_polling, .max_touches = 10, .resolution = 2048, + .no_calibrate_reg = true, }; static int ili251x_read_reg(struct i2c_client *client,@@ -310,8 +312,19 @@ static struct attribute *ili210x_attributes[] = { NULL, }; +static umode_t ili210x_calibrate_visible (struct kobject *kobj, +struct attribute *attr,int index) +{ +struct device *dev =kobj_to_dev (kobj); +struct i2c_client *client =to_i2c_client (dev); +struct ili210x *priv =i2c_get_clientdata (client); + +return !priv->chip->no_calibrate_reg; +} +static const struct attribute_group ili210x_attr_group = { .attrs = ili210x_attributes, + .is_visible = ili210x_calibrate_visible, };static void ili210x_power_down (void *data)Signature · 1 line
2.17.1
Signature · 1 line
Dmitry
Hi,
Quoted 13 lines · Sven Van Asbroeck
The driver's method to retrieve the firmware version on ili2117/ ili2118 chip flavours is incorrect. The firmware version register address and layout are wrong.
The firmware version is not actually used anywhere inside or outside this driver. There is a
dev_dbg()print, but that is only visible when the developer explicitly compiles in debug support.Don't make the code more complicated to preserve a feature that no-one is using. Remove all code associated with chip firmware version.
Quoted 8 lines
Tree: https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git/log/?h=next
Signed-off-by Sven Van Asbroeck <[email protected]>---
The firmware version check does one relevant thing: It tests the I2C communication, which tends to be useful for board bringup and development boards (which often allow to disconnect (touch-)screens).
-- Sebastian
Quoted 61 lines
drivers/input/touchscreen/ili210x.c | 21 --------------------- 1 file changed, 21 deletions(-)drivers/input/touchscreen/ili210x.c +0
-21@@ -21,15 +21,8 @@/* Touchscreen commands */ #define REG_TOUCHDATA 0x10#define REG_PANEL_INFO 0x20 -#define REG_FIRMWARE_VERSION 0x40#define REG_CALIBRATE 0xcc -struct firmware_version { -u8 id; -u8 major; -u8 minor; -} __packed; -struct ili2xxx_chip {int (*read_reg)(struct i2c_client *client,u8 reg,void *buf,size_t len);@@ -342,7 +335,6 @@ static int ili210x_i2c_probe(struct i2c_client *client,struct ili210x *priv;struct gpio_desc *reset_gpio;struct input_dev *input; -struct firmware_version firmware;int error;dev_dbg (dev,"Probing for ILI210X I2C Touschreen driver" );@@ -389,15 +381,6 @@ static int ili210x_i2c_probe(struct i2c_client *client, priv->chip = chip;i2c_set_clientdata (client, priv); -/* Get firmware version */ - error = chip->read_reg (client,REG_FIRMWARE_VERSION , - &firmware,sizeof (firmware)); -if (error) { -dev_err (dev,"Failed to get firmware version, err: %d\n" , - error); -return error; - } -/* Setup input device */ input->name ="ILI210x Touchscreen" ; input->id.bustype =BUS_I2C ;@@ -439,10 +422,6 @@ static int ili210x_i2c_probe(struct i2c_client *client,return error; } -dev_dbg (dev, -"ILI210x initialized (IRQ: %d), firmware version %d.%d.%d" , - client->irq, firmware.id, firmware.major, firmware.minor); -return 0 ; }Signature · 1 line
2.17.1
Dmitry Torokhov
maintainerQuoted 25 lines · Sebastian Reichel
Hi,
Quoted 13 lines · Sven Van Asbroeck
The driver's method to retrieve the firmware version on ili2117/ ili2118 chip flavours is incorrect. The firmware version register address and layout are wrong.
The firmware version is not actually used anywhere inside or outside this driver. There is a
dev_dbg()print, but that is only visible when the developer explicitly compiles in debug support.Don't make the code more complicated to preserve a feature that no-one is using. Remove all code associated with chip firmware version.
Quoted 8 lines
Tree: https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git/log/?h=next
Signed-off-by Sven Van Asbroeck <[email protected]>---
Quoted 4 lines
The firmware version check does one relevant thing: It tests the I2C communication, which tends to be useful for board bringup and development boards (which often allow to disconnect (touch-)screens).
If/when this is needed I propose we add a separate "lite" xfer check, similar to what elants_i2c and many other drivers are doing.
Thanks.
Signature · 1 line
Dmitry
Quoted 13 lines · Sven Van Asbroeck
The driver's method to retrieve the firmware version on ili2117/ ili2118 chip flavours is incorrect. The firmware version register address and layout are wrong.
The firmware version is not actually used anywhere inside or outside this driver. There is a
dev_dbg()print, but that is only visible when the developer explicitly compiles in debug support.Don't make the code more complicated to preserve a feature that no-one is using. Remove all code associated with chip firmware version.
Quoted 7 lines
Tree: https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git/log/?h=next
Signed-off-by Sven Van Asbroeck <[email protected]>
Applied, thank you.
Quoted 62 lines
--- drivers/input/touchscreen/ili210x.c | 21 --------------------- 1 file changed, 21 deletions(-)drivers/input/touchscreen/ili210x.c +0
-21@@ -21,15 +21,8 @@/* Touchscreen commands */ #define REG_TOUCHDATA 0x10#define REG_PANEL_INFO 0x20 -#define REG_FIRMWARE_VERSION 0x40#define REG_CALIBRATE 0xcc -struct firmware_version { -u8 id; -u8 major; -u8 minor; -} __packed; -struct ili2xxx_chip {int (*read_reg)(struct i2c_client *client,u8 reg,void *buf,size_t len);@@ -342,7 +335,6 @@ static int ili210x_i2c_probe(struct i2c_client *client,struct ili210x *priv;struct gpio_desc *reset_gpio;struct input_dev *input; -struct firmware_version firmware;int error;dev_dbg (dev,"Probing for ILI210X I2C Touschreen driver" );@@ -389,15 +381,6 @@ static int ili210x_i2c_probe(struct i2c_client *client, priv->chip = chip;i2c_set_clientdata (client, priv); -/* Get firmware version */ - error = chip->read_reg (client,REG_FIRMWARE_VERSION , - &firmware,sizeof (firmware)); -if (error) { -dev_err (dev,"Failed to get firmware version, err: %d\n" , - error); -return error; - } -/* Setup input device */ input->name ="ILI210x Touchscreen" ; input->id.bustype =BUS_I2C ;@@ -439,10 +422,6 @@ static int ili210x_i2c_probe(struct i2c_client *client,return error; } -dev_dbg (dev, -"ILI210x initialized (IRQ: %d), firmware version %d.%d.%d" , - client->irq, firmware.id, firmware.major, firmware.minor); -return 0 ; }Signature · 1 line
2.17.1
Signature · 1 line
Dmitry