From patchwork Tue Jun 21 19:49:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9191341 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 E7FDD601C0 for ; Tue, 21 Jun 2016 19:51:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D774B28330 for ; Tue, 21 Jun 2016 19:51:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC56E28331; Tue, 21 Jun 2016 19:51:13 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, 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 687CF28324 for ; Tue, 21 Jun 2016 19:51:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751880AbcFUTvK (ORCPT ); Tue, 21 Jun 2016 15:51:10 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:35875 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751870AbcFUTvG (ORCPT ); Tue, 21 Jun 2016 15:51:06 -0400 Received: by mail-lf0-f68.google.com with SMTP id a2so6451993lfe.3 for ; Tue, 21 Jun 2016 12:51:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:subject:to:cc:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=TKnmI+YdienlMTRA8HizF+ZNOARjRWntl0zAGpW7WU8=; b=goHm6vvS+MJg6zQNVFoQUMv7ncg3t7XZx8B9tmI/x73DI/QJshIWbXiJJT6plyg8Pb p/LA7KVyJlIJ7VgMTOIN8w5AW36pSEJO0dcO9PfvUbZZWYfzeHOd9Y1QzwXiicp8FjqJ t385Q5LibbMJB8hfCjSzPxXbLzCS6lYAXDl7kEfvEus6hFifqiJ4/jYcVCUV5XF+BeKx CWWB/LudYBhh39rLzxTGGrKrl+/1jVqpsGjVT4Aepy0lWhhLD32aYGywi6YAYRMUCwTK pDx6YjKJLtsp0vyH2ysU0aomPBR1OJElX4WVNd8+cUYy79AQfkqbkfkm4VKjkHlyiBJA rUpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:cc:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=TKnmI+YdienlMTRA8HizF+ZNOARjRWntl0zAGpW7WU8=; b=BuJkELqIm56vFhJ94ansDNsw2Y/5M6iq4ZyDimJ6lUGJf0Xou/0i5gpidxYMh2C5Ew HvRxE2pTxCMRx2HOLsf2V1AH7THnl/Rx75+islQd6194HcVKDD6eFSQ0kNvRup49qiLa f5v/EP9ajEUVPsiIytqegsISnAr42A6euVVnXMM1fH6su+UFmNbBGjOu7PjwZ3QM42UT OlWLUMcOb0ZZe9I35aqDuih74EJL44QGe/5wMHVnDRUfy2FTqRL4simUaf1pFMeFrWAS ad5M+yQyNkKqDlZQdXtZcP9fnAlWzritSWxytmmG49e06gG48DGJi1kJyso11bQnz2uA hMWQ== X-Gm-Message-State: ALyK8tK2dPX2NcdyLj/7elL+8hq32FAOwoSlYXU6qGFXVdg96VGLXFaja7+n6QXjQ1s9pw== X-Received: by 10.28.168.7 with SMTP id r7mr4876265wme.9.1466538664202; Tue, 21 Jun 2016 12:51:04 -0700 (PDT) Received: from ?IPv6:2003:62:5f01:4400:4a1:d77d:ab9:f21c? (p200300625F01440004A1D77D0AB9F21C.dip0.t-ipconnect.de. [2003:62:5f01:4400:4a1:d77d:ab9:f21c]) by smtp.googlemail.com with ESMTPSA id q6sm42546321wjt.46.2016.06.21.12.51.03 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 21 Jun 2016 12:51:03 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH 3/4] HID: hid-led: add support for ThingM blink(1) To: Benjamin Tissoires Cc: Jiri Kosina , linux-input@vger.kernel.org Message-ID: Date: Tue, 21 Jun 2016 21:49:29 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.1.1 MIME-Version: 1.0 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 ThingM blink(1) and make the dedicated ThingM driver obsolete. Successfully tested with a blink(1) mk2. Signed-off-by: Heiner Kallweit --- drivers/hid/Kconfig | 7 +++--- drivers/hid/hid-led.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 3 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index f7be60f..ab22090 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -393,9 +393,10 @@ config HID_LED depends on HID depends on LEDS_CLASS ---help--- - Support for simple RGB LED devices. Currently supported are the - Riso Kagaku Webmail Notifier and the Dream Cheeky Webmail Notifier - and Friends Alert. + Support for simple RGB LED devices. Currently supported are: + - Riso Kagaku Webmail Notifier + - Dream Cheeky Webmail Notifier and Friends Alert + - ThingM blink(1) To compile this driver as a module, choose M here: the module will be called hid-led. diff --git a/drivers/hid/hid-led.c b/drivers/hid/hid-led.c index 4075f09..e11b645 100644 --- a/drivers/hid/hid-led.c +++ b/drivers/hid/hid-led.c @@ -26,6 +26,7 @@ enum hidled_report_type { enum hidled_type { RISO_KAGAKU, DREAM_CHEEKY, + THINGM, }; static unsigned const char riso_kagaku_tbl[] = { @@ -198,6 +199,57 @@ static int dream_cheeky_init(struct hidled_device *ldev) return hidled_send(ldev, buf); } +static int _thingm_write(struct led_classdev *cdev, enum led_brightness br, + u8 offset) +{ + struct hidled_led *led = to_hidled_led(cdev); + __u8 buf[MAX_REPORT_SIZE] = { [1] = 'c' }; + + buf[2] = led->rgb->red.cdev.brightness; + buf[3] = led->rgb->green.cdev.brightness; + buf[4] = led->rgb->blue.cdev.brightness; + buf[7] = led->rgb->num + offset; + + return hidled_send(led->rgb->ldev, buf); +} + +static int thingm_write_v1(struct led_classdev *cdev, enum led_brightness br) +{ + return _thingm_write(cdev, br, 0); +} + +static int thingm_write(struct led_classdev *cdev, enum led_brightness br) +{ + return _thingm_write(cdev, br, 1); +} + +static const struct hidled_config hidled_config_thingm_v1 = { + .name = "ThingM blink(1) v1", + .short_name = "thingm", + .max_brightness = 255, + .num_leds = 1, + .report_size = 9, + .report_type = RAW_REQUEST, + .report_id = 1, + .write = thingm_write_v1, +}; + +static int thingm_init(struct hidled_device *ldev) +{ + __u8 buf[MAX_REPORT_SIZE] = { [1] = 'v' }; + int ret; + + ret = hidled_recv(ldev, buf); + if (ret) + return ret; + + /* Check for firmware major version 1 */ + if (buf[3] == '1') + ldev->config = &hidled_config_thingm_v1; + + return 0; +} + static const struct hidled_config hidled_configs[] = { { .type = RISO_KAGAKU, @@ -222,6 +274,18 @@ static const struct hidled_config hidled_configs[] = { .init = dream_cheeky_init, .write = dream_cheeky_write, }, + { + .type = THINGM, + .name = "ThingM blink(1)", + .short_name = "thingm", + .max_brightness = 255, + .num_leds = 2, + .report_size = 9, + .report_type = RAW_REQUEST, + .report_id = 1, + .init = thingm_init, + .write = thingm_write, + }, }; static int hidled_init_led(struct hidled_led *led, const char *color_name, @@ -325,6 +389,8 @@ static const struct hid_device_id hidled_table[] = { USB_DEVICE_ID_DREAM_CHEEKY_WN), .driver_data = DREAM_CHEEKY }, { HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, USB_DEVICE_ID_DREAM_CHEEKY_FA), .driver_data = DREAM_CHEEKY }, + { HID_USB_DEVICE(USB_VENDOR_ID_THINGM, + USB_DEVICE_ID_BLINK1), .driver_data = THINGM }, { } }; MODULE_DEVICE_TABLE(hid, hidled_table);