From patchwork Fri Dec 18 02:48:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "james.chen" X-Patchwork-Id: 7879581 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BFCC1BEEE5 for ; Fri, 18 Dec 2015 03:09:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DBFE920453 for ; Fri, 18 Dec 2015 03:09:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 714D120450 for ; Fri, 18 Dec 2015 03:09:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965035AbbLRDJS (ORCPT ); Thu, 17 Dec 2015 22:09:18 -0500 Received: from emcscan.emc.com.tw ([192.72.220.5]:21695 "EHLO emcscan.emc.com.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964901AbbLRDJR (ORCPT ); Thu, 17 Dec 2015 22:09:17 -0500 X-Greylist: delayed 604 seconds by postgrey-1.27 at vger.kernel.org; Thu, 17 Dec 2015 22:09:17 EST Received: from unknown (HELO emc.com.tw) ([192.168.10.1]) by emcscan.emc.com.tw with ESMTP; 18 Dec 2015 10:59:11 +0800 Received: from localhost.localdomain ([192.168.55.122]) by emc.com.tw (8.13.7+Sun/8.13.7) with ESMTP id tBI2wGot018978; Fri, 18 Dec 2015 10:58:18 +0800 (CST) From: "james.chen" To: Jennifer Tsai , Herman Lin , Scott Liu , Charlie Mooney , Dmitry Torokhov , linux-kernel@vger.kernel.org, linux-input@vger.kernel.org Cc: Jeff Chuang , Agnes Cheng , "james.chen" Subject: [PATCH] CHROMIUM: Input: elants_i2c: fixed wake-on-touch issue Date: Fri, 18 Dec 2015 10:48:48 +0800 Message-Id: <1450406929-5975-1-git-send-email-james.chen@emc.com.tw> X-Mailer: git-send-email 1.8.3.2 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "james.chen" Something wrong in suspend/resume of kernel v3.14 for the function of wake-on-touch. The function of device_may_wakeup will return true if the device supports wake-on-touch (for example, kitty and buddy). So, modify the code from "if (device_may_wakeup(dev))" to "if (!device_may_wakeup(dev))". And adjust the condition check of keep_power_in_suspend (designed for minnie). Signed-off-by: James Chen --- drivers/input/touchscreen/elants_i2c.c | 37 +++++++++++++++++----------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c index 17cc20e..06ee814 100644 --- a/drivers/input/touchscreen/elants_i2c.c +++ b/drivers/input/touchscreen/elants_i2c.c @@ -1307,7 +1307,7 @@ static int __maybe_unused elants_i2c_suspend(struct device *dev) struct i2c_client *client = to_i2c_client(dev); struct elants_data *ts = i2c_get_clientdata(client); const u8 set_sleep_cmd[] = { 0x54, 0x50, 0x00, 0x01 }; - int retry_cnt; + int retry; int error; /* Command not support in IAP recovery mode */ @@ -1316,24 +1316,25 @@ static int __maybe_unused elants_i2c_suspend(struct device *dev) disable_irq(client->irq); - if (device_may_wakeup(dev) || ts->keep_power_in_suspend) { - for (retry_cnt = 0; retry_cnt < MAX_RETRIES; retry_cnt++) { + if (device_may_wakeup(dev)) { + /* + * The device will automatically enter idle mode + * that has reduced power consumption. + */ + ts->wake_irq_enabled = (enable_irq_wake(client->irq) == 0); + } else if (ts->keep_power_in_suspend) { + for (retry = 0; retry < MAX_RETRIES; retry++) { error = elants_i2c_send(client, set_sleep_cmd, - sizeof(set_sleep_cmd)); + sizeof(set_sleep_cmd)); if (!error) break; dev_err(&client->dev, "suspend command failed: %d\n", error); } - - if (device_may_wakeup(dev)) - ts->wake_irq_enabled = - (enable_irq_wake(client->irq) == 0); } else { - elants_i2c_power_off(ts); + elants_i2c_power_off(ts); } - return 0; } @@ -1342,16 +1343,17 @@ static int __maybe_unused elants_i2c_resume(struct device *dev) struct i2c_client *client = to_i2c_client(dev); struct elants_data *ts = i2c_get_clientdata(client); const u8 set_active_cmd[] = { 0x54, 0x58, 0x00, 0x01 }; - int retry_cnt; + int retry; int error; - if (device_may_wakeup(dev) && ts->wake_irq_enabled) - disable_irq_wake(client->irq); - - if (ts->keep_power_in_suspend) { - for (retry_cnt = 0; retry_cnt < MAX_RETRIES; retry_cnt++) { + if (device_may_wakeup(dev)) { + if (ts->wake_irq_enabled) + disable_irq_wake(client->irq); + elants_i2c_sw_reset(client); + } else if (ts->keep_power_in_suspend) { + for (retry = 0; retry < MAX_RETRIES; retry++) { error = elants_i2c_send(client, set_active_cmd, - sizeof(set_active_cmd)); + sizeof(set_active_cmd)); if (!error) break; @@ -1362,7 +1364,6 @@ static int __maybe_unused elants_i2c_resume(struct device *dev) elants_i2c_power_on(ts); elants_i2c_initialize(ts); } - ts->state = ELAN_STATE_NORMAL; enable_irq(client->irq);