From patchwork Thu Apr 27 07:40:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masaki Ota <012nexus@gmail.com> X-Patchwork-Id: 9702459 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DB404601D3 for ; Thu, 27 Apr 2017 07:41:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D261928602 for ; Thu, 27 Apr 2017 07:41:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C74802860B; Thu, 27 Apr 2017 07:41:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.5 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,FROM_STARTS_WITH_NUMS,RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA2BB28607 for ; Thu, 27 Apr 2017 07:41:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968079AbdD0HlI (ORCPT ); Thu, 27 Apr 2017 03:41:08 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:33728 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S968089AbdD0Hk4 (ORCPT ); Thu, 27 Apr 2017 03:40:56 -0400 Received: by mail-pf0-f194.google.com with SMTP id c198so7284102pfc.0; Thu, 27 Apr 2017 00:40:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YpjNAfWiG0GiulrOhIQ0ZYEdd6ToF+sG1nDWbaaOmz4=; b=B2DH39ftWYCsDTdLyu1q3CiA/z2O0kMBqEbG3pBnVDIZm5Q04nBaySA3febLI6/jl0 /JaXdZ5nqPlfyyZSw97UQZNYQO9N/im0mRUxxkJ4QWPbSpCQJPigWAr302ahB56LuxyP vyCcPZvnMn2YNLHvvpBzCpDfbOlGOnUaG3NbSl84ivXPBaEijjoO9juHt13BHk2l3G9j Dbk88al0CS5Vv/Z0OUk8EbdSZ4lDU5nWPlEj6gWWW0QIO7EPg81IaZRWS/cP35oQiP4Q b+EtYxsmG+06ReiGL2xMeKI6n1sXnG9qyZ/CFwsxPCamDUOUXlVubTuS03m6K6pdK8R6 9wtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YpjNAfWiG0GiulrOhIQ0ZYEdd6ToF+sG1nDWbaaOmz4=; b=HOSZBNo+n20zl2RblF11VkJ3tmcTA9nlyOLBctN0FFi+6V+nF9tIt/ol7C5BZzjom/ Zv9SKA3P+hGL9QJcWsjRgOR/WIdvHKpWe+AX8eyZAAWGkeMa68nUGm7E9BRpGCB4Ijg1 MAK5sezjto5J+2mefByqkv2I1vfV1Sh7zt363Xj1ydYf3sIBXDaESBXchNGqTNCtY0Eq WobzaZKnScGyd8Ldu9BfHFQMSAvP3JnxsIIUXmyL0+mC7dtP09gLNWeNxZEEbLpKT56h 3jNrWIgyDpirHhSkKmn0OYJJWbNTMLFMLi3dHpK+PzcIaE8kmBnCgO5hlljiHKqZ2Eaq fsFg== X-Gm-Message-State: AN3rC/4/lENIyfnxahhjwNrOGSUJHq8mLOZEqmaKqGuRk74ZsJtGFCo6 X6NkymNZWWhdHg== X-Received: by 10.98.216.134 with SMTP id e128mr4190244pfg.79.1493278855216; Thu, 27 Apr 2017 00:40:55 -0700 (PDT) Received: from localhost (p2239-ipad303aobadori.miyagi.ocn.ne.jp. [123.216.73.239]) by smtp.gmail.com with ESMTPSA id z22sm2841009pfg.117.2017.04.27.00.40.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Apr 2017 00:40:54 -0700 (PDT) From: Masaki Ota <012nexus@gmail.com> X-Google-Original-From: Masaki Ota To: benjamin.tissoires@redhat.com, jikos@kernel.org Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, masaki.ota@jp.alps.com Subject: [PATCH 3/4] Add new Alps U1 Touchpad device Date: Thu, 27 Apr 2017 16:40:33 +0900 Message-Id: <1493278834-8523-4-git-send-email-masaki.ota@jp.alps.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493278834-8523-1-git-send-email-masaki.ota@jp.alps.com> References: <1493278834-8523-1-git-send-email-masaki.ota@jp.alps.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Masaki Ota -Add new Alps U1 Touchpad device ID -Laptop names that use this Touchpad:HP Elitebook x360 1030 G2 Signed-off-by: Masaki Ota --- drivers/hid/hid-alps.c | 3 +++ drivers/hid/hid-core.c | 1 + drivers/hid/hid-ids.h | 1 + 3 files changed, 5 insertions(+) diff --git a/drivers/hid/hid-alps.c b/drivers/hid/hid-alps.c index 0a6c54f..e7ae3a7 100644 --- a/drivers/hid/hid-alps.c +++ b/drivers/hid/hid-alps.c @@ -771,6 +771,7 @@ static int alps_probe(struct hid_device *hdev, const struct hid_device_id *id) data->dev_type = T4; break; case HID_DEVICE_ID_ALPS_U1_DUAL: + case HID_DEVICE_ID_ALPS_U1: data->dev_type = U1; break; default: @@ -795,6 +796,8 @@ static const struct hid_device_id alps_id[] = { { HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_DUAL) }, { HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, + USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1) }, + { HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_T4_BTNLESS) }, { } }; diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 9c3cb2e..779e26c 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1775,6 +1775,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) }, { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0xf705) }, { HID_I2C_DEVICE(USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_DUAL) }, + { HID_I2C_DEVICE(USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1) }, { HID_I2C_DEVICE(USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_T4_BTNLESS) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICMOUSE) }, diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 0b9726d..2b50d12 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -75,6 +75,7 @@ #define USB_VENDOR_ID_ALPS_JP 0x044E #define HID_DEVICE_ID_ALPS_U1_DUAL 0x120B +#define HID_DEVICE_ID_ALPS_U1 0x1215 #define HID_DEVICE_ID_ALPS_T4_BTNLESS 0x120C #define USB_VENDOR_ID_AMI 0x046b