From cffb9355c6679005bc0baa2b8272e6ea2ffd9458 Mon Sep 17 00:00:00 2001 From: Daniel Kurtz Date: Thu, 28 Jun 2012 21:08:02 +0800 Subject: [PATCH] --- yaml --- r: 318289 b: refs/heads/master c: ec02ac2b7e1ad04ab2486fe9b2fbfc3ad5178f7c h: refs/heads/master i: 318287: 65dae6d23e671dc6e28aff1c548e23d7d46e0d3b v: v3 --- [refs] | 2 +- trunk/drivers/input/touchscreen/atmel_mxt_ts.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index cee6fae91e11..9db2582e22df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27c347d64f5e4a7e141f6bdb85bbf59e0f1dcde6 +refs/heads/master: ec02ac2b7e1ad04ab2486fe9b2fbfc3ad5178f7c diff --git a/trunk/drivers/input/touchscreen/atmel_mxt_ts.c b/trunk/drivers/input/touchscreen/atmel_mxt_ts.c index 42e645062c20..b1108cae73ac 100644 --- a/trunk/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/trunk/drivers/input/touchscreen/atmel_mxt_ts.c @@ -250,6 +250,7 @@ struct mxt_finger { struct mxt_data { struct i2c_client *client; struct input_dev *input_dev; + char phys[64]; /* device physical location */ const struct mxt_platform_data *pdata; struct mxt_object *object_table; struct mxt_info info; @@ -1106,6 +1107,10 @@ static int __devinit mxt_probe(struct i2c_client *client, } input_dev->name = "Atmel maXTouch Touchscreen"; + snprintf(data->phys, sizeof(data->phys), "i2c-%u-%04x/input0", + client->adapter->nr, client->addr); + input_dev->phys = data->phys; + input_dev->id.bustype = BUS_I2C; input_dev->dev.parent = &client->dev; input_dev->open = mxt_input_open;