From patchwork Fri Feb 17 13:40:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Drake X-Patchwork-Id: 9579831 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 0D31D6042F for ; Fri, 17 Feb 2017 13:41:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F1B74286CF for ; Fri, 17 Feb 2017 13:41:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E5C7A286D6; Fri, 17 Feb 2017 13:41:04 +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=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, 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 4FDCB286CF for ; Fri, 17 Feb 2017 13:41:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933545AbdBQNlD (ORCPT ); Fri, 17 Feb 2017 08:41:03 -0500 Received: from mail-ua0-f179.google.com ([209.85.217.179]:33925 "EHLO mail-ua0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933336AbdBQNlC (ORCPT ); Fri, 17 Feb 2017 08:41:02 -0500 Received: by mail-ua0-f179.google.com with SMTP id 35so30187406uak.1 for ; Fri, 17 Feb 2017 05:41:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=endlessm-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=aZohLJ1Lk41/2BthAlwS4et6mqrL1Oc9aWNpI4u9BEQ=; b=d3A3uoKtnZg5WKNkOjXXfreniGS4LCrhv9yi+XnAW45cFVF5wQ66Pn35GKFJlz1YKs 5rx+ruImlqcX7fZbJD7p7fRHfVKryevwrDhQXLkhtlCp4Cgruj+BavJte1hoUcyIjmG5 iaUOYLPUqyNvJ61c+L5SN0WvnsyIY+g3I2iGxtQKnsuIvvIwUkMT3O9SardyURHq+fSY 87UflqaIihstOlNW5iQQc1vmg6KDS2AGRjmGRWQNrwihqMF5lLbrv0alTEqEbqh65vph oSWG8a5f9mLwi8345cJ7Aa39V478mHN6FyG8nTWV/w4FStVWYS4SO1qCPASs1Ad5TEdR jsfA== 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; bh=aZohLJ1Lk41/2BthAlwS4et6mqrL1Oc9aWNpI4u9BEQ=; b=DNXKEC7/LF4glWbv5LXbUyfSV/cT4xIOp22l5xraComNCe3VDsu1hMZGtu95NOAgIA L5PKJV7vWxc1asPNv0QbeoIydzqb+T0Wqm5+rgcySFDyjMSoRJg+puFdBKOl0oYNGbud AaaszHxzjkfvLk/061MRAe42RhpqslTNO+yH6SZXBIAV2o6PeMjeHbIfutNUra4xVuDY RpdHj62j2akP7xacLctFyPevInt9l89tHk0Ueambz9YJvkJ8eXIQ/7ity/39lELuv4Vp pJ+ga03OYfw95IOoD7fV9I26QOoWinN+Bga+DYu6G1fcL4zQHgyqUw2RGzSWuKuS/SyX BC+A== X-Gm-Message-State: AMke39nDI/lJkZUMKlLnLgkh2/djglS32PSllm8z3T3S6TGG0cJGB9BN9sf1QtoN8Qo449or X-Received: by 10.159.36.165 with SMTP id 34mr4140882uar.48.1487338861686; Fri, 17 Feb 2017 05:41:01 -0800 (PST) Received: from nuc.gallo.pinto ([186.77.193.106]) by smtp.gmail.com with ESMTPSA id u2sm2646426vkb.19.2017.02.17.05.41.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Feb 2017 05:41:00 -0800 (PST) From: Daniel Drake To: jikos@kernel.org, benjamin.tissoires@redhat.com Cc: linux-input@vger.kernel.org, linux@endlessm.com Subject: [PATCH] hid-chicony: Add support for another ASUS Zen AiO keyboard Date: Fri, 17 Feb 2017 07:40:52 -0600 Message-Id: <20170217134052.440-1-drake@endlessm.com> X-Mailer: git-send-email 2.9.3 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 support for media keys on the keyboard that comes with the Asus V221ID and ZN241IC All In One computers. The keys to support here are WLAN, BRIGHTNESSDOWN and BRIGHTNESSUP. This device is not visibly branded as Chicony, and the USB Vendor ID suggests that it is a JESS device. However this seems like the right place to put it: the usage codes are identical to the currently supported devices, and this driver already supports the ASUS AIO keyboard AK1D. Signed-off-by: Daniel Drake --- drivers/hid/Kconfig | 4 ++-- drivers/hid/hid-chicony.c | 1 + drivers/hid/hid-core.c | 1 + drivers/hid/hid-ids.h | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 1aeb80e..8eab320 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -175,11 +175,11 @@ config HID_CHERRY Support for Cherry Cymotion keyboard. config HID_CHICONY - tristate "Chicony Tactical pad" + tristate "Chicony devices" depends on HID default !EXPERT ---help--- - Support for Chicony Tactical pad. + Support for Chicony Tactical pad and special keys on Chicony keyboards. config HID_CORSAIR tristate "Corsair devices" diff --git a/drivers/hid/hid-chicony.c b/drivers/hid/hid-chicony.c index bc3cec1..f04ed9a 100644 --- a/drivers/hid/hid-chicony.c +++ b/drivers/hid/hid-chicony.c @@ -86,6 +86,7 @@ static const struct hid_device_id ch_devices[] = { { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS2) }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_AK1D) }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_ACER_SWITCH12) }, + { HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_JESS_ZEN_AIO_KBD) }, { } }; MODULE_DEVICE_TABLE(hid, ch_devices); diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 538ff69..405819d 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1909,6 +1909,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081) }, { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A0C2) }, { HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_TABLET) }, + { HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_JESS_ZEN_AIO_KBD) }, { HID_USB_DEVICE(USB_VENDOR_ID_JESS2, USB_DEVICE_ID_JESS2_COLOR_RUMBLE_PAD) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ION, USB_DEVICE_ID_ICADE) }, { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) }, diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 86c95d3..b3df60d 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -557,6 +557,7 @@ #define USB_VENDOR_ID_JESS 0x0c45 #define USB_DEVICE_ID_JESS_YUREX 0x1010 +#define USB_DEVICE_ID_JESS_ZEN_AIO_KBD 0x5112 #define USB_VENDOR_ID_JESS2 0x0f30 #define USB_DEVICE_ID_JESS2_COLOR_RUMBLE_PAD 0x0111