From patchwork Sun Aug 23 04:41:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Ogorchock X-Patchwork-Id: 11731371 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C2E0C618 for ; Sun, 23 Aug 2020 04:42:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A5C232078D for ; Sun, 23 Aug 2020 04:42:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DnYlFAno" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725876AbgHWEma (ORCPT ); Sun, 23 Aug 2020 00:42:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725921AbgHWEmY (ORCPT ); Sun, 23 Aug 2020 00:42:24 -0400 Received: from mail-oi1-x241.google.com (mail-oi1-x241.google.com [IPv6:2607:f8b0:4864:20::241]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 218B1C061573 for ; Sat, 22 Aug 2020 21:42:23 -0700 (PDT) Received: by mail-oi1-x241.google.com with SMTP id z22so5314781oid.1 for ; Sat, 22 Aug 2020 21:42:23 -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 :mime-version:content-transfer-encoding; bh=MiszAOukic7LHG4j+FMHimgzXIzyGDTIZAhegDsdD50=; b=DnYlFAnooTS8lwNPYmaV7NCT5qthboZnd9P664xITVoCx0b6Uy+XALGa9oDpu3y9oe xX3QhCkGPr8cVgGR7nLiVVgaE2UDbhTdWscDuWZHTtfBEuv1KbWN8zRmliIg7HEm8UK0 vFnyiUn7HMpMlVEDCkUM+h6VRHUbxAymBBkhJ54a5PZp4nVu14RnTcqOMfhNghru4JbL 5bYeTbdnHnrrNEPNzvJbU1+9trQYYYJtmT5zmnRG5Czr0VOWPSHxjCu4ug3lUQB7hKbd mKXiv5NYbHSc7S60GoI4DkiaDCnGk/WhABuaBJJS7DZf4nLnjrS3xVQGiTggxDDlKG7I rKVQ== 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:mime-version:content-transfer-encoding; bh=MiszAOukic7LHG4j+FMHimgzXIzyGDTIZAhegDsdD50=; b=hfSCzNd8BqQxx+6GfIj1WNPRyHKfnEM39FLmXbC8KjO8xJyDIptG3Gm9hFTz930sI1 Ers5E+OmVjHj85U7J5f+AoVgVOr6VsR0Es93tOp3183e1DN617Dxaru0dkCQ9cYzwXLh OFaGLV7/zWFrvwvZKDOfQ3cVAeJWJ6W56Vs7MJXlux5VzbFPMlYn7W1Jlfh7YSGP/Ymb B/RvcOiBaz99ch57PDFKg3idkAJgm2y66iY40p0Eh8PWxedarxn47rc0xi0SMDoDNWOg 71e+LDjx+klH3iR4/80keqqJJvXgIyGX53PiZjs75tD9bs4ObflDTBDNGg/anLgmtLDx yoUw== X-Gm-Message-State: AOAM533ys/XDHfQKUFW1sS1ZARpVnB1Fu9ms3JCn2wTbVKERPOtYuuYj fn7Sl4xnYrYba0mOp/RPO7w2Zh17uC8zi1V4 X-Google-Smtp-Source: ABdhPJzkhr4TwjMGtjNHjshljkf+NSUZ4nLgVzLELtSzsua9KVMUXW8bmL/BkhAZKU0j2a/ipfVh2w== X-Received: by 2002:aca:c38c:: with SMTP id t134mr107545oif.15.1598157742344; Sat, 22 Aug 2020 21:42:22 -0700 (PDT) Received: from Arrakis.djogorchock.com ([136.33.205.58]) by smtp.gmail.com with ESMTPSA id z10sm1308572otk.6.2020.08.22.21.42.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Aug 2020 21:42:21 -0700 (PDT) From: "Daniel J. Ogorchock" To: linux-input@vger.kernel.org Cc: thunderbird2k@gmail.com, blaws05@gmail.com, benjamin.tissoires@redhat.com, jikos@kernel.org, Roderick.Colenbrander@sony.com, svv@google.com, s.jegen@gmail.com, carmueller@gmail.com, pgriffais@valvesoftware.com, hadess@hadess.net, "Daniel J. Ogorchock" Subject: [PATCH v12 04/14] HID: nintendo: add home led support Date: Sat, 22 Aug 2020 23:41:47 -0500 Message-Id: <20200823044157.339677-5-djogorchock@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200823044157.339677-1-djogorchock@gmail.com> References: <20200823044157.339677-1-djogorchock@gmail.com> MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org This patch adds the ability to set the intensity level of the home button's LED. Signed-off-by: Daniel J. Ogorchock --- drivers/hid/hid-nintendo.c | 69 +++++++++++++++++++++++++++++++++++--- 1 file changed, 65 insertions(+), 4 deletions(-) diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c index adecd6790fe9..e5afe360c676 100644 --- a/drivers/hid/hid-nintendo.c +++ b/drivers/hid/hid-nintendo.c @@ -192,7 +192,8 @@ struct joycon_input_report { struct joycon_ctlr { struct hid_device *hdev; struct input_dev *input; - struct led_classdev leds[JC_NUM_LEDS]; + struct led_classdev leds[JC_NUM_LEDS]; /* player leds */ + struct led_classdev home_led; enum joycon_ctlr_state ctlr_state; spinlock_t lock; @@ -726,6 +727,40 @@ static int joycon_player_led_brightness_set(struct led_classdev *led, return ret; } +static int joycon_home_led_brightness_set(struct led_classdev *led, + enum led_brightness brightness) +{ + struct device *dev = led->dev->parent; + struct hid_device *hdev = to_hid_device(dev); + struct joycon_ctlr *ctlr; + struct joycon_subcmd_request *req; + u8 buffer[sizeof(*req) + 5] = { 0 }; + u8 *data; + int ret; + + ctlr = hid_get_drvdata(hdev); + if (!ctlr) { + hid_err(hdev, "No controller data\n"); + return -ENODEV; + } + + req = (struct joycon_subcmd_request *)buffer; + req->subcmd_id = JC_SUBCMD_SET_HOME_LIGHT; + data = req->data; + data[0] = 0x01; + data[1] = brightness << 4; + data[2] = brightness | (brightness << 4); + data[3] = 0x11; + data[4] = 0x11; + + hid_dbg(hdev, "setting home led brightness\n"); + mutex_lock(&ctlr->output_mutex); + ret = joycon_send_subcmd(ctlr, req, 5); + mutex_unlock(&ctlr->output_mutex); + + return ret; +} + static const char * const joycon_player_led_names[] = { "player1", "player2", @@ -734,7 +769,7 @@ static const char * const joycon_player_led_names[] = { }; static DEFINE_MUTEX(joycon_input_num_mutex); -static int joycon_player_leds_create(struct joycon_ctlr *ctlr) +static int joycon_leds_create(struct joycon_ctlr *ctlr) { struct hid_device *hdev = ctlr->hdev; struct device *dev = &hdev->dev; @@ -771,7 +806,7 @@ static int joycon_player_leds_create(struct joycon_ctlr *ctlr) ret = devm_led_classdev_register(&hdev->dev, led); if (ret) { hid_err(hdev, "Failed registering %s LED\n", led->name); - break; + return ret; } } @@ -779,6 +814,32 @@ static int joycon_player_leds_create(struct joycon_ctlr *ctlr) input_num = 1; mutex_unlock(&joycon_input_num_mutex); + /* configure the home LED */ + if (ctlr->hdev->product != USB_DEVICE_ID_NINTENDO_JOYCONL) { + name = devm_kasprintf(dev, GFP_KERNEL, "%s:%s", d_name, "home"); + if (!name) + return ret; + + led = &ctlr->home_led; + led->name = name; + led->brightness = 0; + led->max_brightness = 0xF; + led->brightness_set_blocking = joycon_home_led_brightness_set; + led->flags = LED_CORE_SUSPENDRESUME | LED_HW_PLUGGABLE; + ret = devm_led_classdev_register(&hdev->dev, led); + if (ret) { + hid_err(hdev, "Failed registering home led\n"); + return ret; + } + /* Set the home LED to 0 as default state */ + ret = joycon_home_led_brightness_set(led, 0); + if (ret) { + hid_err(hdev, "Failed to set home LED dflt; ret=%d\n", + ret); + return ret; + } + } + return 0; } @@ -1027,7 +1088,7 @@ static int nintendo_hid_probe(struct hid_device *hdev, mutex_unlock(&ctlr->output_mutex); /* Initialize the leds */ - ret = joycon_player_leds_create(ctlr); + ret = joycon_leds_create(ctlr); if (ret) { hid_err(hdev, "Failed to create leds; ret=%d\n", ret); goto err_close;