From patchwork Tue Sep 12 02:54:13 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: 9948311 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 44CBA604D5 for ; Tue, 12 Sep 2017 02:56:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3300428CE0 for ; Tue, 12 Sep 2017 02:56:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2479A28DE7; Tue, 12 Sep 2017 02:56:10 +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 1EF7C28DDD for ; Tue, 12 Sep 2017 02:56:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750969AbdILCzO (ORCPT ); Mon, 11 Sep 2017 22:55:14 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:35644 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751411AbdILCym (ORCPT ); Mon, 11 Sep 2017 22:54:42 -0400 Received: by mail-pg0-f68.google.com with SMTP id j16so2430859pga.2; Mon, 11 Sep 2017 19:54:42 -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=XjLkL3AYVQrQFelwryP7QYsZ6hw8fCLyepAL0R9ny88=; b=hlQuihv/txXfpg36jiHZdt+8UtFyiqh1CA3LchcQ4Jg3KISFKO23hW3H6aW70xPAuv n14BQZrqXRhkbaUKjFh4Ab4J8KTe5+W765/B0Qr8tJvVxtODzetJNG8awxOUTr90X9X5 4DNFdm1Hci5qvg3AvRdpn//1QOVppuzlMIwqejj4grjodSkFUsoEtAeK+8kuqtLLEIGN L89YX4qSJpM1l9RfDsv2Rbo7/KQQAPlMHU9/9g/dyBrShhoylton8nDfO1JLjnK9kIpb CSR7kUoRbvvt/smYYVzyRqVmdFH3EIKoNTFXas8JTBnE+IYvlZdl2V18lfI2cV4pkvCZ OLqw== 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=XjLkL3AYVQrQFelwryP7QYsZ6hw8fCLyepAL0R9ny88=; b=YeghEZpLwItF57XcL+teI7tg5Udl2cNGatHaOn0hpAYWmBq5+1ZaTaJt/tn15HaJT9 zysibRkUDggjSlbp/OIQCmEqwbWgXTonCr9iPmz/AzsXDPbyEHr5AWz1Rbs/Bn85lABS XXIz84V4WyFy8Xz3NNrAG+rxx+VbZAfblS3fmRALEuM14tyRWaPpmI7xWROqcbzhzBUz X3CBBCpp394UBh/0KU05T1MfEcVfNH0r2Ek+ljhS6A/m2XSimZT7GSwuF1KuhwR6kh5T rzUY3/KPdRHsJrEV4mOEzkHpmNDNwPm4dq9bPPAt5Gw4LBAWGph1yq6XhK61XtS8D3jh 2FaA== X-Gm-Message-State: AHPjjUiSZis19V5HBLF6dB6RP/X5c/YuGNBCggGWTYisHP+v9uUCsG2y uAk4nOyiuv10V5aV6/0/rQ== X-Google-Smtp-Source: ADKCNb4BzzZExkzQ8HIV83uMdc0Hoxiz+NCTetRqUM+PHrczCa2ZsNHygEVePbYBCjaeDp75tXQ1MQ== X-Received: by 10.101.75.136 with SMTP id t8mr12990356pgq.359.1505184882328; Mon, 11 Sep 2017 19:54:42 -0700 (PDT) Received: from localhost (p2142-ipad301aobadori.miyagi.ocn.ne.jp. [123.216.57.142]) by smtp.gmail.com with ESMTPSA id b22sm16973064pfh.175.2017.09.11.19.54.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Sep 2017 19:54: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 for supporting it Date: Tue, 12 Sep 2017 11:54:13 +0900 Message-Id: <20170912025414.3784-7-masaki.ota@jp.alps.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170912025414.3784-1-masaki.ota@jp.alps.com> References: <20170912025414.3784-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 0a6c54fb47c8..e7ae3a7b8e7d 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 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