Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3391534pxk; Mon, 5 Oct 2020 08:32:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzs9+VKs8I64R3EuXXgjpskqD5dm7Ite912yLsK3zW2rREIVZsM/HqRLw/2NMsMA6zgSeEF X-Received: by 2002:a17:906:6007:: with SMTP id o7mr288868ejj.550.1601911951029; Mon, 05 Oct 2020 08:32:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601911951; cv=none; d=google.com; s=arc-20160816; b=Rzn4rGDU9PCGvAcQSKhmT2SYdzBAkU7KP9A69j/UfFEet/Vh9eruEZwMQS+FkkzUnS zLfHU5lp5lhUOoOAKGKfLVH76pYVuU1MZRh4vXCvKOWgor9mvf+iXq/A6bnb25HFldIQ xD3mvOjqGvPgzi49+No+QtPySGI57nv7lRbB1pw3kPEt0oVwrcb7h64HWz+8AGxhL4RI 0FalXwGBAKvV+l3dspFprBKKFDMVwOK2ZfQGSTBCxij9yNs7/rAmeACQRbU6eDb4iYWe XCkv5lMycpzMzrLpWUzJy4+xjYenXUW4SMrun13W/RzF1eZwaMV4RmxNlgY7PieZ7FLi OABA== 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=rfcx5dfilMks7s76vh6wlxJ5kqM4ks1n62VxXvdrOm8=; b=ExcUG+yRsW8O64twLMDrJs5iqfxVibIVqaKWLEHMmUb/c4MOiklE/pidqpeV6bb0it 4vQhqBOHZAqVBebtn7YuSVcEg8VKKDcci1UPOVPOcCJ5WpAwEdN7Mz1oU5GnkB7zm788 nWAljmUvBQ4pOCZpTnRL1DbPziwdYpt8Mtq46HTjjpC8mPTOPIGKFNk98WeK1aYgjSuT nXEKcH3mv/lTaMabHyYnkxGvFcP2m5G7iEPH+axQQMoFJNAG3RcyJ7ckofE+0OG2wPOL f5WgaqHGJzqSlnqbLxf+ta8gtG7z2IlH4FrmstbtUxoFprTcRGuk4SGsCH9MNZk96Huu 46ug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fZBclt0R; 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 u1si11777edy.369.2020.10.05.08.32.06; Mon, 05 Oct 2020 08:32:31 -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=fZBclt0R; 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 S1727367AbgJEP2T (ORCPT + 99 others); Mon, 5 Oct 2020 11:28:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:52438 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727295AbgJEP1p (ORCPT ); Mon, 5 Oct 2020 11:27:45 -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 1606720637; Mon, 5 Oct 2020 15:27:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601911664; bh=wdSL9Ci2BXi8AAOSb+xjbL9GL4LfqK+9bfXkgj2I75Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fZBclt0RYLNwM66O3DRgf7HY4BUFB0mnkFiDdo7/jLuITEh7IiPD6hIW9Jmjk+rLV XfjNMD0I+Ms3W3M3cukeyeP5Z/EK9P/j9afvFB7dWFEt0zGkFXpMFNTsqj/R7T5A8b FYwgi0dRY+Y3h23KKK7+DBRoE9L2taNLXuQe92nQ= 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.19 29/38] Input: trackpoint - enable Synaptics trackpoints Date: Mon, 5 Oct 2020 17:26:46 +0200 Message-Id: <20201005142110.077809961@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201005142108.650363140@linuxfoundation.org> References: <20201005142108.650363140@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 31c16b68aa311..e468657854094 100644 --- a/drivers/input/mouse/trackpoint.c +++ b/drivers/input/mouse/trackpoint.c @@ -285,6 +285,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