--- v15
+++ v12
@@ -5,14 +5,14 @@
Signed-off-by: Daniel J. Ogorchock <djogorchock@gmail.com>
---
drivers/hid/Kconfig | 2 +
- drivers/hid/hid-nintendo.c | 97 +++++++++++++++++++++++++++++++++++++-
- 2 files changed, 97 insertions(+), 2 deletions(-)
+ drivers/hid/hid-nintendo.c | 95 +++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 95 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
-index 24df4dc4beaa5..4517e98872fc6 100644
+index b5cd42ed3b04..af4d543c0ff9 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
-@@ -733,6 +733,8 @@ config HID_MULTITOUCH
+@@ -713,6 +713,8 @@ config HID_MULTITOUCH
config HID_NINTENDO
tristate "Nintendo Joy-Con and Pro Controller support"
depends on HID
@@ -22,7 +22,7 @@
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-nintendo.c b/drivers/hid/hid-nintendo.c
-index b6c0e5e36d8b0..e8f9fb8c3c11b 100644
+index 7273ddf033e2..c3eec9b7c99c 100644
--- a/drivers/hid/hid-nintendo.c
+++ b/drivers/hid/hid-nintendo.c
@@ -25,6 +25,7 @@
@@ -33,18 +33,12 @@
#include <linux/module.h>
#include <linux/spinlock.h>
-@@ -184,10 +185,19 @@ struct joycon_input_report {
+@@ -183,11 +184,13 @@ struct joycon_input_report {
+ } __packed;
#define JC_MAX_RESP_SIZE (sizeof(struct joycon_input_report) + 35)
++#define JC_NUM_LEDS 4
-+static const char * const joycon_player_led_names[] = {
-+ LED_FUNCTION_PLAYER "-1",
-+ LED_FUNCTION_PLAYER "-2",
-+ LED_FUNCTION_PLAYER "-3",
-+ LED_FUNCTION_PLAYER "-4",
-+};
-+#define JC_NUM_LEDS ARRAY_SIZE(joycon_player_led_names)
-+
/* Each physical controller is associated with a joycon_ctlr struct */
struct joycon_ctlr {
struct hid_device *hdev;
@@ -53,7 +47,7 @@
enum joycon_ctlr_state ctlr_state;
/* The following members are used for synchronous sends/receives */
-@@ -553,11 +563,9 @@ static const unsigned int joycon_dpad_inputs_jc[] = {
+@@ -553,11 +556,9 @@ static const unsigned int joycon_dpad_inputs_jc[] = {
BTN_DPAD_UP, BTN_DPAD_DOWN, BTN_DPAD_LEFT, BTN_DPAD_RIGHT,
};
@@ -65,7 +59,7 @@
const char *name;
int ret;
int i;
-@@ -643,6 +651,59 @@ static int joycon_input_create(struct joycon_ctlr *ctlr)
+@@ -643,6 +644,66 @@ static int joycon_input_create(struct joycon_ctlr *ctlr)
if (ret)
return ret;
@@ -110,6 +104,13 @@
+ 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)
+{
@@ -125,24 +126,22 @@
/* Set the default controller player leds based on controller number */
mutex_lock(&joycon_input_num_mutex);
mutex_lock(&ctlr->output_mutex);
-@@ -650,6 +711,31 @@ static int joycon_input_create(struct joycon_ctlr *ctlr)
+@@ -650,6 +711,29 @@ 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 = devm_kasprintf(dev, GFP_KERNEL, "%s:%s:%s",
-+ d_name,
-+ "green",
++ name = devm_kasprintf(dev, GFP_KERNEL, "%s:%s", d_name,
+ joycon_player_led_names[i]);
+ if (!name)
+ return -ENOMEM;
+
+ led = &ctlr->leds[i];
+ led->name = name;
-+ led->brightness = ((i + 1) <= input_num) ? 1 : 0;
-+ led->max_brightness = 1;
++ 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;
@@ -157,7 +156,7 @@
if (++input_num > 4)
input_num = 1;
mutex_unlock(&joycon_input_num_mutex);
-@@ -813,6 +899,13 @@ static int nintendo_hid_probe(struct hid_device *hdev,
+@@ -815,6 +899,13 @@ static int nintendo_hid_probe(struct hid_device *hdev,
mutex_unlock(&ctlr->output_mutex);
@@ -172,5 +171,5 @@
if (ret) {
hid_err(hdev, "Failed to create input device; ret=%d\n", ret);
--
-2.33.0
+2.28.0