Commit c7dded5b authored by Sven Van Asbroeck's avatar Sven Van Asbroeck Committed by Dmitry Torokhov

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.
Signed-off-by: default avatarSven Van Asbroeck <TheSven73@gmail.com>
Link: https://lore.kernel.org/r/20191112164429.11225-1-TheSven73@gmail.comSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 8d13c764
...@@ -21,15 +21,8 @@ ...@@ -21,15 +21,8 @@
/* Touchscreen commands */ /* Touchscreen commands */
#define REG_TOUCHDATA 0x10 #define REG_TOUCHDATA 0x10
#define REG_PANEL_INFO 0x20 #define REG_PANEL_INFO 0x20
#define REG_FIRMWARE_VERSION 0x40
#define REG_CALIBRATE 0xcc #define REG_CALIBRATE 0xcc
struct firmware_version {
u8 id;
u8 major;
u8 minor;
} __packed;
struct ili2xxx_chip { struct ili2xxx_chip {
int (*read_reg)(struct i2c_client *client, u8 reg, int (*read_reg)(struct i2c_client *client, u8 reg,
void *buf, size_t len); void *buf, size_t len);
...@@ -342,7 +335,6 @@ static int ili210x_i2c_probe(struct i2c_client *client, ...@@ -342,7 +335,6 @@ static int ili210x_i2c_probe(struct i2c_client *client,
struct ili210x *priv; struct ili210x *priv;
struct gpio_desc *reset_gpio; struct gpio_desc *reset_gpio;
struct input_dev *input; struct input_dev *input;
struct firmware_version firmware;
int error; int error;
dev_dbg(dev, "Probing for ILI210X I2C Touschreen driver"); dev_dbg(dev, "Probing for ILI210X I2C Touschreen driver");
...@@ -389,15 +381,6 @@ static int ili210x_i2c_probe(struct i2c_client *client, ...@@ -389,15 +381,6 @@ static int ili210x_i2c_probe(struct i2c_client *client,
priv->chip = chip; priv->chip = chip;
i2c_set_clientdata(client, priv); 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 */ /* Setup input device */
input->name = "ILI210x Touchscreen"; input->name = "ILI210x Touchscreen";
input->id.bustype = BUS_I2C; input->id.bustype = BUS_I2C;
...@@ -439,10 +422,6 @@ static int ili210x_i2c_probe(struct i2c_client *client, ...@@ -439,10 +422,6 @@ static int ili210x_i2c_probe(struct i2c_client *client,
return error; return error;
} }
dev_dbg(dev,
"ILI210x initialized (IRQ: %d), firmware version %d.%d.%d",
client->irq, firmware.id, firmware.major, firmware.minor);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment