From patchwork Thu Mar 30 02:53:17 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: 9652871 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 5833460349 for ; Thu, 30 Mar 2017 02:53:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E49E2848D for ; Thu, 30 Mar 2017 02:53:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4350028496; Thu, 30 Mar 2017 02:53:46 +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 F2E5D2848D for ; Thu, 30 Mar 2017 02:53:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754540AbdC3Cxe (ORCPT ); Wed, 29 Mar 2017 22:53:34 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:36233 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754335AbdC3Cxc (ORCPT ); Wed, 29 Mar 2017 22:53:32 -0400 Received: by mail-pg0-f68.google.com with SMTP id 81so6419454pgh.3; Wed, 29 Mar 2017 19:53:31 -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=olrByI1jO+DW+YFjrADY/uHcgabS372y0QFE1XTUF9Y=; b=PsbuiSrURnUg8TkgOk3ZNiIdgGedeCngi+cebiBJABAGjgtxHsE0F6/SBjqHgeeOYe KDGCQXx3fEJCqYoIcy2d9rK5NM+d9pK6x1BhyemGaFlWR5VEQ4LE7qVQ2uG08pVh8auT hhyr+1YpgkpGm2eLbBBaMibN6bBhGqRAh25i/JtW3zDuNnqVTJthSi0mxNaFscPZDoA9 isPSOENH2lUU2NSin5fm9pjXHvBeoQUmAvDqdkYIBj7Dj51LKXQbYX3io4hTtZ/vVdCU sE/x0f+7b5uQQe0AcIWeG/WY6WzK64PEOaVq3nV00te3vb/2X3H8U4SXLJbf241jfYo+ xMgQ== 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=olrByI1jO+DW+YFjrADY/uHcgabS372y0QFE1XTUF9Y=; b=lOfEHBXQvDTy1XZEZzSUzQRxxeU7MWjgxU54BJ42vR+CaduJjev+NKM3Ia2v2LVchp y1jXYnNeFM61YNeUe8vD7HgPR5nfEl7gB6pFIHZc1yyZfQb0n5fhyDDH7NIZjfa5n6Fr gLK1LLftJEFzZDZbBiG2wnyoSlvRstf4mCr4NMOnszYgWlaJHS53rJalj/At6vQBOyvt GrudKNLA9sYrLh4+L544UtcluArbRTmSk7B4IKEyZLe+svDc9G2PtUIiN8PuQEcPYAkR b3wYCvWfeMovDZsE6JZnqsTvTyMDgy4PmRCuKjN9vmN135Q8qG5zeY5kDaAKR0cfs45L 4nDA== X-Gm-Message-State: AFeK/H3rIR+cI51vTT55TTZX9VtVQa+byVr21Rl7f1aw1Zxp7JLSUgKmWKDc7u7vVCLKwA== X-Received: by 10.98.76.140 with SMTP id e12mr3646116pfj.82.1490842411239; Wed, 29 Mar 2017 19:53:31 -0700 (PDT) Received: from localhost (p2239-ipad303aobadori.miyagi.ocn.ne.jp. [123.216.73.239]) by smtp.gmail.com with ESMTPSA id a5sm722285pfh.124.2017.03.29.19.53.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 29 Mar 2017 19:53:30 -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 2/2] Add new U1 device ID Date: Thu, 30 Mar 2017 11:53:17 +0900 Message-Id: <20170330025317.4093-3-masaki.ota@jp.alps.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170330025317.4093-1-masaki.ota@jp.alps.com> References: <20170330025317.4093-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 -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 13a6db1..f19a7f4 100644 --- a/drivers/hid/hid-alps.c +++ b/drivers/hid/hid-alps.c @@ -758,6 +758,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: @@ -782,6 +783,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 f315192..0f88944 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1770,6 +1770,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 9239543..e0bad95 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