From patchwork Mon Mar 11 02:03:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Ogorchock X-Patchwork-Id: 10846565 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8EE1B1823 for ; Mon, 11 Mar 2019 02:04:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7AD0328D43 for ; Mon, 11 Mar 2019 02:04:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F1E328D4E; Mon, 11 Mar 2019 02:04:08 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 E611128D43 for ; Mon, 11 Mar 2019 02:04:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727148AbfCKCEH (ORCPT ); Sun, 10 Mar 2019 22:04:07 -0400 Received: from mail-yw1-f65.google.com ([209.85.161.65]:37664 "EHLO mail-yw1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726758AbfCKCEH (ORCPT ); Sun, 10 Mar 2019 22:04:07 -0400 Received: by mail-yw1-f65.google.com with SMTP id k14so2632592ywe.4 for ; Sun, 10 Mar 2019 19:04:06 -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=T6k/eQgqOVvnhKag5UpGkNvhNzB3Z963soX3T6WKykk=; b=O/iXedK2u+muvrOi87Kx0gBNrVhhUQwHoTAciT4H5Ybg9W/a28yjoRh5fkT9WzVHuE hOrne/9ZVvnrcflHOILEz7ibRv1ezXxjJRViGE4O2k5yRydob0w478/v10CkN6A6Paxr BchKOFkS2qua8CcL683b3KEKkzs6cCGISu6r1hDVz9de6aQsjXO/F6aCnDYbWUf96Am9 RK5yNO3JlYlH08TGKq47tVLg1NCSQ2WVtWZYXCsSE4E1fZgmdrE+9aKu7HBUtEzO9XJY RfYdOEa4rQXDMnFK/ExUEJK2auxS/eQEtA9tiLhAcbqNLSNXeBud8IRNC+u+GiKvDcCE gWhg== 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=T6k/eQgqOVvnhKag5UpGkNvhNzB3Z963soX3T6WKykk=; b=BLC8jjNVJtjJuAdyHosOojod01eI+fxM0/6kGZQsmrNPdRlv3jmgXMG4JcBva2Cnl0 +QHP1OMSL3gkBXoBEhKi/rut0uT/FH/dA6ScMOCBkg83Gy0cAfFN0w7wTvf9z7c+miFz SRDPNFWHPbDAVJhgc8E9ZwX562CHLmNoydGAywlVQ9tlk44sXrGkOvIXr3GVbC0vkW4H n38yGUefFvtQRwZytoc+Xlqw1KGv8zdlp/zHn/YKddF4njiXRfhfiS74fyZ99z1VKWso eGm/f4s0SEqfx9XTHe6bfwk6iaP1pNpXtuWM1oK4qcEJkupme2cGnkHBqXJVeVQTUqW5 /pfg== X-Gm-Message-State: APjAAAWIQJuplKKCDrskmLpHlP7JGzlkTBwp9dcHMkx/Olgl8l4ounCv 5xTvMy9Mv0OVi6Drf1iU1O1GLFHk9fU= X-Google-Smtp-Source: APXvYqxjXIaFX9T65zIDGWZXWqg6ZnubXdflyuYdIWJczaACr3J4uRe0ODhqTaOlG+uimKPZlgpIFQ== X-Received: by 2002:a81:5f86:: with SMTP id t128mr24344552ywb.467.1552269845885; Sun, 10 Mar 2019 19:04:05 -0700 (PDT) Received: from localhost.localdomain ([136.61.179.39]) by smtp.gmail.com with ESMTPSA id r130sm1907088ywr.4.2019.03.10.19.04.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Mar 2019 19:04:05 -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, peter.hutterer@who-t.net, jbrandst@2ds.eu, hadess@hadess.net, "Daniel J. Ogorchock" Subject: [PATCH v4 2/6] HID: joycon: add player led support Date: Sun, 10 Mar 2019 21:03:21 -0500 Message-Id: <20190311020324.23619-3-djogorchock@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190311020324.23619-1-djogorchock@gmail.com> References: <20190311020324.23619-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 X-Virus-Scanned: ClamAV using ClamSMTP This patch adds led_classdev functionality to the switch controller driver. It adds support for the 4 player LEDs. The Home Button LED still needs to be supported on the pro controllers and right joy-con. Signed-off-by: Daniel J. Ogorchock --- drivers/hid/Kconfig | 2 + drivers/hid/hid-joycon.c | 111 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 106 insertions(+), 7 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 085633df2972..f324ef3face3 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -448,6 +448,8 @@ config HID_JABRA config HID_JOYCON tristate "Nintendo Joy-Con and Pro Controller support" depends on HID + depends on NEW_LEDS + depends on LEDS_CLASS help Adds support for the Nintendo Switch Joy-Cons and Pro Controller. All controllers support bluetooth, and the Pro Controller also supports diff --git a/drivers/hid/hid-joycon.c b/drivers/hid/hid-joycon.c index e70b9f8239ca..fde7ae3bb9bf 100644 --- a/drivers/hid/hid-joycon.c +++ b/drivers/hid/hid-joycon.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -186,11 +187,13 @@ struct joycon_input_report { } __packed; #define JC_MAX_RESP_SIZE (sizeof(struct joycon_input_report) + 35) +#define JC_NUM_LEDS 4 /* Each physical controller is associated with a joycon_ctlr struct */ struct joycon_ctlr { struct hid_device *hdev; struct input_dev *input; + struct led_classdev leds[JC_NUM_LEDS]; enum joycon_ctlr_state ctlr_state; /* The following members are used for synchronous sends/receives */ @@ -491,11 +494,9 @@ static const unsigned int joycon_button_inputs[] = { 0 /* 0 signals end of array */ }; -static DEFINE_MUTEX(joycon_input_num_mutex); static int joycon_input_create(struct joycon_ctlr *ctlr) { struct hid_device *hdev; - static int input_num = 1; const char *name; int ret; int i; @@ -554,6 +555,70 @@ static int joycon_input_create(struct joycon_ctlr *ctlr) if (ret) goto err_input; + return 0; + +err_input: + input_free_device(ctlr->input); +err: + return ret; +} + +static int joycon_player_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; + int val = 0; + int i; + int ret; + int num; + + ctlr = hid_get_drvdata(hdev); + if (!ctlr) { + hid_err(hdev, "No controller data\n"); + return -ENODEV; + } + + /* determine which player led this is */ + for (num = 0; num < JC_NUM_LEDS; num++) { + if (&ctlr->leds[num] == led) + break; + } + if (num >= JC_NUM_LEDS) + return -EINVAL; + + mutex_lock(&ctlr->output_mutex); + for (i = 0; i < JC_NUM_LEDS; i++) { + if (i == num) + val |= brightness << i; + else + val |= ctlr->leds[i].brightness << i; + } + ret = joycon_set_player_leds(ctlr, 0, val); + mutex_unlock(&ctlr->output_mutex); + + return ret; +} + +static const char * const joycon_player_led_names[] = { + "player1", + "player2", + "player3", + "player4" +}; + +static DEFINE_MUTEX(joycon_input_num_mutex); +static int joycon_player_leds_create(struct joycon_ctlr *ctlr) +{ + struct hid_device *hdev = ctlr->hdev; + struct led_classdev *led; + size_t name_len; + char *name; + int ret = 0; + int i; + static int input_num = 1; + /* Set the default controller player leds based on controller number */ mutex_lock(&joycon_input_num_mutex); mutex_lock(&ctlr->output_mutex); @@ -561,15 +626,40 @@ static int joycon_input_create(struct joycon_ctlr *ctlr) if (ret) hid_warn(ctlr->hdev, "Failed to set leds; ret=%d\n", ret); mutex_unlock(&ctlr->output_mutex); + + /* configure the player LEDs */ + for (i = 0; i < JC_NUM_LEDS; i++) { + name_len = strlen(joycon_player_led_names[i]) + + strlen(dev_name(&hdev->dev)) + 2; + name = devm_kzalloc(&hdev->dev, name_len, GFP_KERNEL); + if (!name) { + ret = -ENOMEM; + break; + } + ret = snprintf(name, name_len, "%s:%s", dev_name(&hdev->dev), + joycon_player_led_names[i]); + if (ret < 0) + break; + + led = &ctlr->leds[i]; + led->name = name; + led->brightness = ((i + 1) <= input_num) ? LED_ON : LED_OFF; + led->max_brightness = LED_ON; + led->brightness_set_blocking = + joycon_player_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 %s LED\n", led->name); + break; + } + } + if (++input_num > 4) input_num = 1; mutex_unlock(&joycon_input_num_mutex); - return 0; - -err_input: - input_free_device(ctlr->input); -err: return ret; } @@ -738,6 +828,13 @@ static int joycon_hid_probe(struct hid_device *hdev, goto err_close; } + /* Initialize the leds */ + ret = joycon_player_leds_create(ctlr); + if (ret) { + hid_err(hdev, "Failed to create leds; ret=%d\n", ret); + goto err_close; + } + ctlr->ctlr_state = JOYCON_CTLR_STATE_READ; hid_dbg(hdev, "probe - success\n");