summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2013-03-24 00:50:36 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2013-03-24 00:50:36 +0100
commitd4321aeb4502a8e09e02216ee6d417f75f98a903 (patch)
tree0dcc54f809f3c4d7e7628bcb24630ddf9839df53
parent704a6aed9d13aa5ac0ea30cc0e5b9db48bfdf751 (diff)
input: touchscreen: wm97xx-core: android idc parser hack
The Android idc parser seems to have an issue with spaces in names: D/EventHub( 159): No input device configuration file found for device 'wm97xx touchscreen'. Rename the driver in order for the idc parser to recognise idc file /system/usr/idc/wm97xx-ts.idc being a simple copy of the qwerty.idc one.
-rw-r--r--drivers/input/touchscreen/wm97xx-core.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c
index 9a1e3d582600..72e2abea2c28 100644
--- a/drivers/input/touchscreen/wm97xx-core.c
+++ b/drivers/input/touchscreen/wm97xx-core.c
@@ -654,7 +654,12 @@ static int wm97xx_probe(struct device *dev)
}
/* set up touch configuration */
+#ifdef CONFIG_ANDROID
+ /* Hack: rename due to idc parser having issues with spaces in names */
+ wm->input_dev->name = "wm97xx-ts";
+#else /* CONFIG_ANDROID */
wm->input_dev->name = "wm97xx touchscreen";
+#endif /* CONFIG_ANDROID */
wm->input_dev->phys = "wm97xx";
wm->input_dev->open = wm97xx_ts_input_open;
wm->input_dev->close = wm97xx_ts_input_close;