CHROMIUM: Input: atmel_mxt_ts : Set power/wakeup to disabled by default.

Userspace will change it to enabled if needed.

Signed-off-by: Benson Leung <bleung@chromium.org>
BUG=chrome-os-partner:17336
TEST=cat /sys/bus/i2c/devices/2-004a/power/wakeup
Check that it returns "disabled"
Suspend the system using powerd_suspend.
Check that the touch device 2-004a does not wake the system.

Reviewed-on: https://gerrit.chromium.org/gerrit/41679
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Reviewed-by: Puneet Kumar <puneetster@chromium.org>
Commit-Queue: Benson Leung <bleung@chromium.org>
Tested-by: Benson Leung <bleung@chromium.org>
(cherry picked from commit 6625e780bacf270b6da346751819d2825f09c20a)

Change-Id: I99fe9106c47a0fca765ead7478c8f9d7bfb251e9
Reviewed-on: https://gerrit.chromium.org/gerrit/41686
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Commit-Queue: Benson Leung <bleung@chromium.org>
Tested-by: Benson Leung <bleung@chromium.org>

diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 639c48687b7906942bbaa6876583c706eb4eab6c..3fdc51387cbe2c4264fa2ef8fcc6c3d3a193dc3b 100644 (file)
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -2696,6 +2696,8 @@ static int __devinit mxt_probe(struct i2c_client *client,
        init_completion(&data->bl_completion);
        init_completion(&data->auto_cal_completion);
 
+       device_set_wakeup_enable(&client->dev, false);
+
        async_schedule(mxt_initialize_async, data);
 
        return 0;