Received: by 2002:a25:ef43:0:0:0:0:0 with SMTP id w3csp129148ybm; Tue, 26 May 2020 12:30:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZNKrM/PzFrJfyU7qndU7BR8yyxXDILXzJZ0ydLP6wKN8arW8AT6zQanyxpBTTqnN9IrSj X-Received: by 2002:aa7:c609:: with SMTP id h9mr4054069edq.155.1590521400732; Tue, 26 May 2020 12:30:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590521400; cv=none; d=google.com; s=arc-20160816; b=zr/B8cnHWRRcnse2gnIxrLHgxVPgq0RNsJKBaFa1952//9YvXbs1AQqGc7mWiYwTrp 28MvozVnZCn5w06A7WzsLRmR8kNzGC2fcQSbO8JeiD/veOOZ7awg4P248RKOvSBliAAY KQgrkk40BizECesqyZKIx1kb+eoI44cb2gFn9TEDytg7igKCdGXqM3EFwN7BDzKVm0n6 gCM1spV3klLhTmTAzThce1enUJzanv0A/F55QpxPrx0pR6ZKXgI/AQVqziH7zVLHzuLC 9vbjAtAwtjn2NYdsum8Gjd+sQX+vTXs6h6t1a4eLIWBt/fOuY5hXzfreJQbK9XxB05gX 1UfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=nTGCXDlkTO6llHB51HO5L8jbpFHsij3k9EDlNucqm9Q=; b=r5x1hTnynTwrwqF8QXjNggd34NQUJW9ue40sQ8mhLsXadjr1kRsZkGFvsRi9z2r1yA B1Vpj23dTSj+clnC9sPwLlhrb3YcfJNTOzYiqVSJ/wXc+HCboeb0PowBZ9kunOpqZZyh zbwDuQZO3Hh8cxcb1D/LqMQZ/wb5D4QBkD3PvpnGDNkRnr5/BKSQ9eochYCQ22vaoct5 uxoAimw7F68H9Soqw4niOhJ6OFeDMjgPXSLiCH0Tt3lSGPlOZycjHNf4pZwtZg6jumQk 5pERCPb0OJOuD119Y2CKuqhA10DxcNEeFyxvBfqjddmVvOd0Uo8bzUbc5RgYm1XI85wZ ROAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=L6Tz6xo9; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z2si488312edp.280.2020.05.26.12.29.37; Tue, 26 May 2020 12:30:00 -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=L6Tz6xo9; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391461AbgEZT05 (ORCPT + 99 others); Tue, 26 May 2020 15:26:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:60818 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389774AbgEZTEw (ORCPT ); Tue, 26 May 2020 15:04:52 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 152382086A; Tue, 26 May 2020 19:04:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590519892; bh=Xvv+FdlC04ssSt3A38EU2gkkWbZ8KSIMSeziWGxBUUg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L6Tz6xo9rC+QhFf325zTh065c3VsKjNx2H7nW7fbMiwdm7vYOkPSYyNxf3pjc5uj0 2ZyuB+lsDgZK7rxjf0I3lhz1t7tL0JOkTb7NeklsoMZ7kTrfljXUTLPPeDhPueRNVb zGfOp7fjOEmOzRdrx0PBMP2tD3g1/x2t25wTe65I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Artem Borisov , Jiri Kosina , Sasha Levin Subject: [PATCH 4.19 17/81] HID: alps: Add AUI1657 device ID Date: Tue, 26 May 2020 20:52:52 +0200 Message-Id: <20200526183928.396594129@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200526183923.108515292@linuxfoundation.org> References: <20200526183923.108515292@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Artem Borisov [ Upstream commit 640e403b1fd24e7f31ac6f29f0b6a21d285ed729 ] This device is used on Lenovo V130-15IKB variants and uses the same registers as U1. Signed-off-by: Artem Borisov Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- drivers/hid/hid-alps.c | 1 + drivers/hid/hid-ids.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/hid/hid-alps.c b/drivers/hid/hid-alps.c index 895f49b565ee..28ca21014bbe 100644 --- a/drivers/hid/hid-alps.c +++ b/drivers/hid/hid-alps.c @@ -806,6 +806,7 @@ static int alps_probe(struct hid_device *hdev, const struct hid_device_id *id) break; case HID_DEVICE_ID_ALPS_U1_DUAL: case HID_DEVICE_ID_ALPS_U1: + case HID_DEVICE_ID_ALPS_1657: data->dev_type = U1; break; default: diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index ae145bdcd83d..53ac5e1ab4bc 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -83,7 +83,7 @@ #define HID_DEVICE_ID_ALPS_U1 0x1215 #define HID_DEVICE_ID_ALPS_T4_BTNLESS 0x120C #define HID_DEVICE_ID_ALPS_1222 0x1222 - +#define HID_DEVICE_ID_ALPS_1657 0x121E #define USB_VENDOR_ID_AMI 0x046b #define USB_DEVICE_ID_AMI_VIRT_KEYBOARD_AND_MOUSE 0xff10 -- 2.25.1