From patchwork Thu Apr 7 22:52:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 8777861 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2257B9F39A for ; Thu, 7 Apr 2016 22:51:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 34DAB2020F for ; Thu, 7 Apr 2016 22:51:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B4F55201CD for ; Thu, 7 Apr 2016 22:50:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753186AbcDGWu6 (ORCPT ); Thu, 7 Apr 2016 18:50:58 -0400 Received: from mail-yw0-f193.google.com ([209.85.161.193]:36259 "EHLO mail-yw0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751895AbcDGWu5 (ORCPT ); Thu, 7 Apr 2016 18:50:57 -0400 Received: by mail-yw0-f193.google.com with SMTP id i125so1407848ywe.3; Thu, 07 Apr 2016 15:50:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=fQOrx4pk//4+B0DsFl6CJxVX05Fywbsk9s5VX76HW6M=; b=kW9ghVrj8CAQclI1d9ZLgTdCmXMN9F/0LdY3Aw6O414iJzh/XZcKEN1najyL6z6MUD pc5+DGrrxlW8ulMnjCcIjAlNMsdqPVWcR8YP1LwLKfNk2wPTYv5vAcSMOlBB9YmQENgm 7EWjsUqieaS5m6Q0FXCT2oUOHEKwnVI9S3FxrkAAMryrhnHxmDerKMWRR2lcK7AB8MKz QkiYTH0kyFNK9GGwNt7iH3UihUL6dH2CPQwOWU736B0oEaCcSJC0SJpRYWKjCTYxPtjN edWkoC/HLrFC4jBxzR+cGIhrFirE3UD6d9PpYGPJ12RQhe2+FMh5RTTzI6idn0xlpJpa MdoA== X-Gm-Message-State: AD7BkJIFLEzlMDBGRPvfAdFP3s1Ll3bT4oTWrzKz7pEe4X5HNzj/yNxZT0fc96B4OFDPGA== X-Received: by 10.37.230.87 with SMTP id d84mr3399483ybh.186.1460069451748; Thu, 07 Apr 2016 15:50:51 -0700 (PDT) Received: from localhost.localdomain (cpe-75-180-230-22.ec.res.rr.com. [75.180.230.22]) by smtp.gmail.com with ESMTPSA id k193sm623750ywe.11.2016.04.07.15.50.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Apr 2016 15:50:50 -0700 (PDT) From: Tom Rini To: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Olof Johansson , Nick Dyer , Dmitry Torokhov , Henrik Rydberg Subject: [PATCH] Revert "Input: atmel_mxt_ts - disable interrupt for 50ms after reset" Date: Thu, 7 Apr 2016 18:52:25 -0400 Message-Id: <1460069545-10322-1-git-send-email-trini@konsulko.com> X-Mailer: git-send-email 1.7.9.5 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.5 required=5.0 tests=BAYES_00, RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_DNSWL_HI, 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 This reverts commit 885f3fb9fa1f9e185e8a4e905157087495734349 due to this change breaking the touchpad on the Chromebook Pixel 2015 on resume from sleep or warm resets. Cc: Olof Johansson Cc: Nick Dyer Cc: Dmitry Torokhov Cc: Henrik Rydberg Signed-off-by: Tom Rini --- drivers/input/touchscreen/atmel_mxt_ts.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 2160512..9b92b60 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -1098,9 +1098,7 @@ static int mxt_soft_reset(struct mxt_data *data) struct device *dev = &data->client->dev; int ret = 0; - dev_info(dev, "Resetting device\n"); - - disable_irq(data->irq); + dev_info(dev, "Resetting chip\n"); reinit_completion(&data->reset_completion); @@ -1108,11 +1106,6 @@ static int mxt_soft_reset(struct mxt_data *data) if (ret) return ret; - /* Ignore CHG line for 100ms after reset */ - msleep(100); - - enable_irq(data->irq); - ret = mxt_wait_for_completion(data, &data->reset_completion, MXT_RESET_TIMEOUT); if (ret)