summaryrefslogtreecommitdiff
path: root/drivers/input/touchscreen/tsc2004.c
diff options
context:
space:
mode:
authorMichael Welling <mwelling@ieee.org>2016-07-20 10:02:07 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-07-20 17:50:24 -0700
commite9003c9cfaa17d26991688268b04244adb67ee2b (patch)
treec3faf81b0fb86053c3f407dd1e2b6a8f7a04a38c /drivers/input/touchscreen/tsc2004.c
parent510cccb5b0c8868a2b302a0ab524da7912da648b (diff)
Input: tsc200x - report proper input_dev name
Passes input_id struct to the common probe function for the tsc200x drivers instead of just the bustype. This allows for the use of the product variable to set the input_dev->name variable according to the type of touchscreen used. Note that when we introduced support for TSC2004 we started calling everything TSC200X, so let's keep this quirk. Signed-off-by: Michael Welling <mwelling@ieee.org> Cc: stable@vger.kernel.org Acked-by: Pavel Machek <pavel@ucw.cz> Acked-by: Pali Rohár <pali.rohar@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/touchscreen/tsc2004.c')
-rw-r--r--drivers/input/touchscreen/tsc2004.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/tsc2004.c b/drivers/input/touchscreen/tsc2004.c
index 7295c198aa08..6fe55d598fac 100644
--- a/drivers/input/touchscreen/tsc2004.c
+++ b/drivers/input/touchscreen/tsc2004.c
@@ -22,6 +22,11 @@
#include <linux/regmap.h>
#include "tsc200x-core.h"
+static const struct input_id tsc2004_input_id = {
+ .bustype = BUS_I2C,
+ .product = 2004,
+};
+
static int tsc2004_cmd(struct device *dev, u8 cmd)
{
u8 tx = TSC200X_CMD | TSC200X_CMD_12BIT | cmd;
@@ -42,7 +47,7 @@ static int tsc2004_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
- return tsc200x_probe(&i2c->dev, i2c->irq, BUS_I2C,
+ return tsc200x_probe(&i2c->dev, i2c->irq, &tsc2004_input_id,
devm_regmap_init_i2c(i2c, &tsc200x_regmap_config),
tsc2004_cmd);
}