aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Kurtz <djkurtz@chromium.org>2012-06-28 09:08:02 -0400
committerHenrik Rydberg <rydberg@euromail.se>2012-06-29 09:58:01 -0400
commitec02ac2b7e1ad04ab2486fe9b2fbfc3ad5178f7c (patch)
tree5b2fc032f191ddff7753957a505bb5ab97584e3d
parent27c347d64f5e4a7e141f6bdb85bbf59e0f1dcde6 (diff)
Input: atmel_mxt_ts - derive phys from i2c client adapter
This allows userspace to more easily distinguish which bus a particular atmel_mxt_ts device is attached to. The resulting phys will be something like: i2c-1-0067/input0 Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
-rw-r--r--drivers/input/touchscreen/atmel_mxt_ts.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 42e645062c20..b1108cae73ac 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -250,6 +250,7 @@ struct mxt_finger {
250struct mxt_data { 250struct mxt_data {
251 struct i2c_client *client; 251 struct i2c_client *client;
252 struct input_dev *input_dev; 252 struct input_dev *input_dev;
253 char phys[64]; /* device physical location */
253 const struct mxt_platform_data *pdata; 254 const struct mxt_platform_data *pdata;
254 struct mxt_object *object_table; 255 struct mxt_object *object_table;
255 struct mxt_info info; 256 struct mxt_info info;
@@ -1106,6 +1107,10 @@ static int __devinit mxt_probe(struct i2c_client *client,
1106 } 1107 }
1107 1108
1108 input_dev->name = "Atmel maXTouch Touchscreen"; 1109 input_dev->name = "Atmel maXTouch Touchscreen";
1110 snprintf(data->phys, sizeof(data->phys), "i2c-%u-%04x/input0",
1111 client->adapter->nr, client->addr);
1112 input_dev->phys = data->phys;
1113
1109 input_dev->id.bustype = BUS_I2C; 1114 input_dev->id.bustype = BUS_I2C;
1110 input_dev->dev.parent = &client->dev; 1115 input_dev->dev.parent = &client->dev;
1111 input_dev->open = mxt_input_open; 1116 input_dev->open = mxt_input_open;