From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 122C2C433DF for ; Tue, 26 May 2020 19:27:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DAAEE20721 for ; Tue, 26 May 2020 19:26:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590521219; bh=Xvv+FdlC04ssSt3A38EU2gkkWbZ8KSIMSeziWGxBUUg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QM5XQrYO3VI+K5Q9YzpSz3wkVyIey2SYOdnIeyoY1rGWRqry3isO8pGe2Zt/u+9kz deRuSuq5EB1qINf/EfYpf8y/luWFg52LsxoBfliWCGlHNYUAKAfBcuD0pBoeTeOGZ1 rfk6gFnLzM4MsZtlsjSxNM5FKcbJWkrE5OEjEJJk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391627AbgEZT06 (ORCPT ); Tue, 26 May 2020 15:26:58 -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