From patchwork Wed Sep 30 22:50:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason A. Donenfeld" X-Patchwork-Id: 254941 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F220C4363D for ; Wed, 30 Sep 2020 22:51:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4FA1F2076A for ; Wed, 30 Sep 2020 22:51:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="klLUXIlO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731866AbgI3WvB (ORCPT ); Wed, 30 Sep 2020 18:51:01 -0400 Received: from mail.zx2c4.com ([192.95.5.64]:39265 "EHLO mail.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731816AbgI3WvB (ORCPT ); Wed, 30 Sep 2020 18:51:01 -0400 Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTP id 9291792c; Wed, 30 Sep 2020 22:19:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=zx2c4.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=mail; bh=rmxCMxgjVwyPO2dr8MlSFoQOZ pk=; b=klLUXIlOtynAsTpg6gB75JYntVXafiN73obBafoLafjpBQDebSHBDTMmb 837M6mj2ak/YpUj6z0AhwdO5ptvZCSpmIUOyga4VjA7ERDtfhvO8LkkchUBKqqn4 E7LG3RcRz5K6e5eo/lZhd5ic7DeNmO4yNh11QtP9ZVOkLyiAVdvjUZBjCPc3SlJ0 iap2aJeLW/vIfSS3WjeMGEimdc815NJ9fE5ZCV5/zwHFXKGs0H1KPw0p/rec047g qmP8iZh5rzLfxvjz04CCpL20Xbx+yQ10+21ysssavRFNz7PFbMfnEio45Mg+N6lw rJS0WvoB3saDseVC75ubO4UtztrwA== Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id cdf88a96 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 30 Sep 2020 22:19:12 +0000 (UTC) From: "Jason A. Donenfeld" To: linux-input@vger.kernel.org, Vincent Huang , Lyude Paul , Dmitry Torokhov , Jiri Kosina , Andrew Duggan , Hans de Goede , Benjamin Tissoires , Chris Heiny Cc: "Jason A. Donenfeld" Subject: [PATCH v3 1/2] Input: synaptics-rmi4 - support bootloader v8 in f34v7 Date: Thu, 1 Oct 2020 00:50:45 +0200 Message-Id: <20200930225046.173190-2-Jason@zx2c4.com> In-Reply-To: <20200930225046.173190-1-Jason@zx2c4.com> References: <5bd2bb9d925cfc81392bd9bf93b31ce4fd81e107.camel@redhat.com> <20200930225046.173190-1-Jason@zx2c4.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org With the recent addition of the F3A support, we can now accept bootloader v8, which will help support recent Thinkpads. Acked-by: Lyude Paul Cc: Vincent Huang Signed-off-by: Jason A. Donenfeld --- drivers/input/rmi4/rmi_f34v7.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/input/rmi4/rmi_f34v7.c b/drivers/input/rmi4/rmi_f34v7.c index 74f7c6f214ff..8cfaa2f19ed5 100644 --- a/drivers/input/rmi4/rmi_f34v7.c +++ b/drivers/input/rmi4/rmi_f34v7.c @@ -1364,9 +1364,12 @@ int rmi_f34v7_probe(struct f34_data *f34) f34->bl_version = 6; } else if (f34->bootloader_id[1] == 7) { f34->bl_version = 7; + } else if (f34->bootloader_id[1] == 8) { + f34->bl_version = 8; } else { - dev_err(&f34->fn->dev, "%s: Unrecognized bootloader version\n", - __func__); + dev_err(&f34->fn->dev, "%s: Unrecognized bootloader version: %d (%c) %d (%c)\n", + __func__, f34->bootloader_id[0], f34->bootloader_id[0], + f34->bootloader_id[1], f34->bootloader_id[1]); return -EINVAL; } From patchwork Wed Sep 30 22:50:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason A. Donenfeld" X-Patchwork-Id: 293912 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32961C4727F for ; Wed, 30 Sep 2020 22:51:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EC2D92075F for ; Wed, 30 Sep 2020 22:51:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="j+tN/SRC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731882AbgI3WvD (ORCPT ); Wed, 30 Sep 2020 18:51:03 -0400 Received: from mail.zx2c4.com ([192.95.5.64]:39265 "EHLO mail.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731816AbgI3WvD (ORCPT ); Wed, 30 Sep 2020 18:51:03 -0400 Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTP id cffc2817; Wed, 30 Sep 2020 22:19:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=zx2c4.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=mail; bh=kOYM4L67LRr9QyZjXSzj5T+Yb qc=; b=j+tN/SRCVIA+xaydInczb6w/j22ecShlMmmrS8UrYppmgKHX5paXXXuBc vbXyGpYfH7GQ4efTwfN7tOyFWj/HuLs6O7KACzxoc5s/ywN3+0vbk0nHrqZ5Cb1t dOpAKN+xvWsGzLqW6IUutJrBR+jJP8oE89fAZmANkEYeQHp1hfOLfI0okaxnqnzb OxFK60a196zpVsRI02a9LYLdRjGM7kod0dawoDNDROcuzwsONpUWRyx5gW5RSG1I 3JmEyABbW9UV4yCr0XCE2ICTgm5MXWHc4ZW6TIMNfaCK5zeQrjuOebzUkskr0Gg5 XtT8IIbWMoOSkjmG2qU0aaM2yIoKA== Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id c784ca7a (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 30 Sep 2020 22:19:15 +0000 (UTC) From: "Jason A. Donenfeld" To: linux-input@vger.kernel.org, Vincent Huang , Lyude Paul , Dmitry Torokhov , Jiri Kosina , Andrew Duggan , Hans de Goede , Benjamin Tissoires , Chris Heiny Cc: "Jason A. Donenfeld" Subject: [PATCH v3 2/2] Input: synaptics - enable InterTouch for ThinkPad P1/X1E gen 2 Date: Thu, 1 Oct 2020 00:50:46 +0200 Message-Id: <20200930225046.173190-3-Jason@zx2c4.com> In-Reply-To: <20200930225046.173190-1-Jason@zx2c4.com> References: <5bd2bb9d925cfc81392bd9bf93b31ce4fd81e107.camel@redhat.com> <20200930225046.173190-1-Jason@zx2c4.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org With the new RMI4 F3A support, we're now able to enable full RMI4 support for this model. We also tidy up the comments a bit, as the X1E is essentially the same computer as the P1. Acked-by: Lyude Paul Cc: Vincent Huang Signed-off-by: Jason A. Donenfeld --- drivers/input/mouse/synaptics.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index 8a54efd6eb95..bf0f3fdf10d9 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@ -179,7 +179,8 @@ static const char * const smbus_pnp_ids[] = { "LEN0093", /* T480 */ "LEN0096", /* X280 */ "LEN0097", /* X280 -> ALPS trackpoint */ - "LEN0099", /* X1 Extreme 1st */ + "LEN0099", /* X1 Extreme Gen 1 / P1 Gen 1 */ + "LEN0402", /* X1 Extreme Gen 2 / P1 Gen 2 */ "LEN009b", /* T580 */ "LEN200f", /* T450s */ "LEN2044", /* L470 */