Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp4272235pxu; Mon, 12 Oct 2020 14:28:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzslZbh2nkppraz6AZyXc8iU6byjhFEG4S6vljGUs+QzMETKKvsyzlUqEq57TlhZMmqdb6U X-Received: by 2002:a17:906:468c:: with SMTP id a12mr29193964ejr.269.1602538132263; Mon, 12 Oct 2020 14:28:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602538132; cv=none; d=google.com; s=arc-20160816; b=KsuVbuyfZJaHUdQZm0gst9XlGsZtsR14LyXCmPUSuQUX39Jh8I2Qs+UbmQ/q+j2Ffm ewJEbm5Fc3ie7btINM7buGO/SxmQU5KimEm15H+CoV9ivQG28rjqxwKfkz0AKUcyTDcc aFrRsrBFaOSegfkyn8o+t945w25EWMpEhH3x+vvBiS2INBAjeu1eQCyYz8n1tt+/3Uaw eTZdCKOFqcxJgr9173Xgvx1af6RVTgy2vYsiCGN+Gllzh3d4tvYe8MFEBQHT+5JocDmO 69lepb01U+eqkyxadVho3/9PLdvTtIETc7sw/UvVmqTPGyRQOEIkvSMws+M/YWkgnnJK wOUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=lgy08AOcwzkVupJvJ4DBRKwQcNuCRpJgcYxTbA6Hyzw=; b=PgRV499EN0ATwEZ0UDaRBmmD+pcVrmUyVyYY6xQPdiOOxLE8gLDnYZzgbRj0tYUzl5 iUS010YVKAM62s79OxaZFd0jbZMm1uOgAVi4LFOdIkPoRmTLf68hoMdqsPa0/UxFXf9V IBQrMFfnozR3MSKqaMOqQeQWKM2ahuIY1RkEOFWt5lEPrVbb1v8K9RaLliK5SmDSTVCo wFGQbrFv4692e8LknNVkDSOUJmAzH8w8cHfrljTqnoCkBjNnC7Wj9dxEFRBEKA0C25I2 /vgCERnQV0iSBthGwT4pwhnL1BM4zkBgsuComhzqm4u0HfnBiD19wzlpjSDn/3xSvzBh eDdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=kPihAtvw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r9si12585488ejd.280.2020.10.12.14.28.29; Mon, 12 Oct 2020 14:28:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=kPihAtvw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731192AbgJLNiY (ORCPT + 99 others); Mon, 12 Oct 2020 09:38:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:40136 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731071AbgJLNh3 (ORCPT ); Mon, 12 Oct 2020 09:37:29 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EBB8720838; Mon, 12 Oct 2020 13:37:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602509844; bh=lMHk6vGMQm8emrttKTj9eLIguT4SBsKvtAze+o64K4w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kPihAtvwFuPLhhO1xEZYDGyQSDtdS5PlVNb3Ck53txv0Pr0gyB3RUfxqM1z611Sbw 5U6MgXlXB8q6yV0MZMXw9UEPWOyUjdJiDEe24FYobopEyZrrEisdw9XSv+OYj7m9wL /LibMMwOCM3c83pFprAkTTMtK6wRC1ewkd7ZVZ9E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vincent Huang , Harry Cutts , Dmitry Torokhov , Sasha Levin Subject: [PATCH 4.14 23/70] Input: trackpoint - enable Synaptics trackpoints Date: Mon, 12 Oct 2020 15:26:39 +0200 Message-Id: <20201012132631.334250451@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201012132630.201442517@linuxfoundation.org> References: <20201012132630.201442517@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vincent Huang [ Upstream commit 996d585b079ad494a30cac10e08585bcd5345125 ] Add Synaptics IDs in trackpoint_start_protocol() to mark them as valid. Signed-off-by: Vincent Huang Fixes: 6c77545af100 ("Input: trackpoint - add new trackpoint variant IDs") Reviewed-by: Harry Cutts Tested-by: Harry Cutts Link: https://lore.kernel.org/r/20200924053013.1056953-1-vincent.huang@tw.synaptics.com Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin --- drivers/input/mouse/trackpoint.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c index d68aba9c5dd62..673bfbb01ca2e 100644 --- a/drivers/input/mouse/trackpoint.c +++ b/drivers/input/mouse/trackpoint.c @@ -297,6 +297,8 @@ static int trackpoint_start_protocol(struct psmouse *psmouse, case TP_VARIANT_ALPS: case TP_VARIANT_ELAN: case TP_VARIANT_NXP: + case TP_VARIANT_JYT_SYNAPTICS: + case TP_VARIANT_SYNAPTICS: if (variant_id) *variant_id = param[0]; if (firmware_id) -- 2.25.1