From patchwork Fri Oct 6 02:53:18 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: 9988307 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 5532C60216 for ; Fri, 6 Oct 2017 02:54:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 41832262AE for ; Fri, 6 Oct 2017 02:54:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 35F0227F4B; Fri, 6 Oct 2017 02:54:26 +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=unavailable 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 D4C74262AE for ; Fri, 6 Oct 2017 02:54:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751423AbdJFCyL (ORCPT ); Thu, 5 Oct 2017 22:54:11 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:34486 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751844AbdJFCxm (ORCPT ); Thu, 5 Oct 2017 22:53:42 -0400 Received: by mail-pg0-f66.google.com with SMTP id u27so16939994pgn.1; Thu, 05 Oct 2017 19:53:41 -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=uy8V9zkyKZ9snWg3w0OqlABfUJFRCWo3Ncq8ca3Oq9k=; b=INAPt6sy+vyTo1yW+8fnBYVwdRKiwlUdrWOoxx0Pl73ajuYSgw+MLLMoBSC5rxDJzI 6OOSvT/2lmdA2+a8ApWjKIg1Zkd9u3prnXRescm5d8nZLfSTgFqHxjD5To29XJqThtCC 9VDi2s3R0GW8/PEMyB/aSq0n27eetyO4njVCkphTOjVEK5/60bCK7eY8iI6ulLkTJYgf zlCaBptN/0h2ja7PS6t9Cppgrbybxqe082uybmYx55ViTcG5CY5r0zNuy9l7pI4FEX1l CDNLM0ehAV3bCGbzOwgxOyTD7y9byJEj7wM6fdZ32Zo02Ld3yYNKvXo6/UFhuEC6kWOh s5Zg== 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=uy8V9zkyKZ9snWg3w0OqlABfUJFRCWo3Ncq8ca3Oq9k=; b=JJqTTwKxKIu3zCdCWFZKIsMc1jvfrXkH9HnE2+MxjKSjLQVo0TT487p5+3PngFqfZh vGk/jLD1c5XfI/52+YE7DkgrHWWsWAVM6V4XN2FluH2ORG+3kqXUICIhPScRigzQl93x lpYOfAMy7qpWL5q5q31529VuLG0+G9YufnEaKHoDfg2x0tcAMdZxkzhhqxpKjfW6Y7AW RJVQOcaqlC7Fvw1UbkUHnm4KHTHJ7/nFohMe7W6C0CNpJB/TpVL5wg2l3NK1prCqnVk4 U+d/2+LTYBSr7oY2s9JG4mHyEYNAvhU+aEIaWVZbxZv/fSKIxcmRZkp5zv2PLZtAF1aZ 6z+Q== X-Gm-Message-State: AMCzsaXZeaw8mQgrvbEySdj7RFMBdqlnFWj2JpUyBDaVZ9mFNaVGq7bp nuh9vZgIzmTcIjKIzDdXmpw= X-Google-Smtp-Source: AOwi7QB/pEMqAkAuJD+DanRdFMn2vQS3GhMimUB7Q1m5LJgzwDPOt0R4bRZuGx25Xvjbvo9yjJgSfw== X-Received: by 10.84.136.135 with SMTP id 7mr636009pll.19.1507258421632; Thu, 05 Oct 2017 19:53:41 -0700 (PDT) Received: from localhost (p2218-ipad303aobadori.miyagi.ocn.ne.jp. [123.216.73.218]) by smtp.gmail.com with ESMTPSA id c82sm491604pfe.172.2017.10.05.19.53.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Oct 2017 19:53:41 -0700 (PDT) From: Masaki Ota <012nexus@gmail.com> X-Google-Original-From: Masaki Ota To: jikos@kernel.org, benjamin.tissoires@redhat.com Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, masaki.ota@jp.alps.com Subject: [PATCH 6/7] Add new U1 device ID Date: Fri, 6 Oct 2017 11:53:18 +0900 Message-Id: <20171006025319.2505-7-masaki.ota@jp.alps.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171006025319.2505-1-masaki.ota@jp.alps.com> References: <20171006025319.2505-1-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 U1 device Product ID -This device is used on HP Elite book x360 series 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 5ae2cba8fe76..b1eeb4839bfc 100644 --- a/drivers/hid/hid-alps.c +++ b/drivers/hid/hid-alps.c @@ -767,6 +767,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: @@ -791,6 +792,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 9c3cb2e467e9..779e26cb3ba9 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 0b9726d321ee..2b50d12b993e 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