From patchwork Sun May 19 07:27:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Ma X-Patchwork-Id: 10949567 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C201A933 for ; Sun, 19 May 2019 19:24:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC57E284ED for ; Sun, 19 May 2019 19:24:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9CDF8285C4; Sun, 19 May 2019 19:24:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB7F9284ED for ; Sun, 19 May 2019 19:24:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726811AbfESTYE (ORCPT ); Sun, 19 May 2019 15:24:04 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:53818 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726066AbfESTYE (ORCPT ); Sun, 19 May 2019 15:24:04 -0400 Received: from [61.149.195.63] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1hSGE9-0004LW-GN; Sun, 19 May 2019 07:27:26 +0000 From: Aaron Ma To: aaron.ma@canonical.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, dmitry.torokhov@gmail.com, benjamin.tissoires@redhat.com Subject: [PATCH 1/2] Input: elantech - enable middle button support on 2 ThinkPads Date: Sun, 19 May 2019 15:27:10 +0800 Message-Id: <20190519072711.2592-1-aaron.ma@canonical.com> X-Mailer: git-send-email 2.17.1 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Adding 2 new touchpad PNPIDs to enable middle button support. Cc: stable@vger.kernel.org Signed-off-by: Aaron Ma --- drivers/input/mouse/elantech.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index a7f8b1614559..530142b5a115 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -1189,6 +1189,8 @@ static const char * const middle_button_pnp_ids[] = { "LEN2132", /* ThinkPad P52 */ "LEN2133", /* ThinkPad P72 w/ NFC */ "LEN2134", /* ThinkPad P72 */ + "LEN0407", + "LEN0408", NULL }; From patchwork Sun May 19 07:27:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Ma X-Patchwork-Id: 10949569 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2F1DA924 for ; Sun, 19 May 2019 19:24:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21DFE284ED for ; Sun, 19 May 2019 19:24:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 14E53285C4; Sun, 19 May 2019 19:24:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ABEA7284ED for ; Sun, 19 May 2019 19:24:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730070AbfESTYG (ORCPT ); Sun, 19 May 2019 15:24:06 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:53819 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726066AbfESTYG (ORCPT ); Sun, 19 May 2019 15:24:06 -0400 Received: from [61.149.195.63] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1hSGEC-0004LW-CO; Sun, 19 May 2019 07:27:29 +0000 From: Aaron Ma To: aaron.ma@canonical.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, dmitry.torokhov@gmail.com, benjamin.tissoires@redhat.com Subject: [PATCH 2/2] Input: synaptics - remove X240 from the topbuttonpad list Date: Sun, 19 May 2019 15:27:11 +0800 Message-Id: <20190519072711.2592-2-aaron.ma@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190519072711.2592-1-aaron.ma@canonical.com> References: <20190519072711.2592-1-aaron.ma@canonical.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Lenovo ThinkPad X240 does not have the top software button. When this wrong ID in top button list, smbus mode will fail to probe, so keep it working at PS2 mode. Cc: stable@vger.kernel.org Signed-off-by: Aaron Ma --- drivers/input/mouse/synaptics.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index b6da0c1267e3..6ae7bc92476b 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@ -140,7 +140,6 @@ static const char * const topbuttonpad_pnp_ids[] = { "LEN002E", "LEN0033", /* Helix */ "LEN0034", /* T431s, L440, L540, T540, W540, X1 Carbon 2nd */ - "LEN0035", /* X240 */ "LEN0036", /* T440 */ "LEN0037", /* X1 Carbon 2nd */ "LEN0038",