--- v8
+++ v16
@@ -5,14 +5,14 @@
Signed-off-by: Daniel J. Ogorchock <djogorchock@gmail.com>
---
drivers/hid/Kconfig | 2 +
- drivers/hid/hid-nintendo.c | 95 +++++++++++++++++++++++++++++++++++++-
- 2 files changed, 95 insertions(+), 2 deletions(-)
+ drivers/hid/hid-nintendo.c | 97 +++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 97 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
-index 47ec750c2baf..41f7da50896f 100644
+index 60c4f555773d4..0f65a986943c9 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
-@@ -695,6 +695,8 @@ config HID_MULTITOUCH
+@@ -734,6 +734,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 9021d25bf158..083d174dc12d 100644
+index b6c0e5e36d8b0..b869738910afc 100644
--- a/drivers/hid/hid-nintendo.c
+++ b/drivers/hid/hid-nintendo.c
@@ -25,6 +25,7 @@
@@ -33,12 +33,18 @@
#include <linux/module.h>
#include <linux/spinlock.h>
-@@ -178,11 +179,13 @@ struct joycon_input_report {
- } __packed;
+@@ -184,10 +185,19 @@ struct joycon_input_report {
#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_PLAYER1,
++ LED_FUNCTION_PLAYER2,
++ LED_FUNCTION_PLAYER3,
++ LED_FUNCTION_PLAYER4,
++};
++#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;
@@ -47,8 +53,8 @@
enum joycon_ctlr_state ctlr_state;
/* The following members are used for synchronous sends/receives */
-@@ -517,11 +520,9 @@ static const unsigned int joycon_button_inputs[] = {
- 0 /* 0 signals end of array */
+@@ -553,11 +563,9 @@ static const unsigned int joycon_dpad_inputs_jc[] = {
+ BTN_DPAD_UP, BTN_DPAD_DOWN, BTN_DPAD_LEFT, BTN_DPAD_RIGHT,
};
-static DEFINE_MUTEX(joycon_input_num_mutex);
@@ -59,7 +65,7 @@
const char *name;
int ret;
int i;
-@@ -576,6 +577,66 @@ static int joycon_input_create(struct joycon_ctlr *ctlr)
+@@ -643,6 +651,59 @@ static int joycon_input_create(struct joycon_ctlr *ctlr)
if (ret)
return ret;
@@ -104,13 +110,6 @@
+ 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)
+{
@@ -126,22 +125,24 @@
/* Set the default controller player leds based on controller number */
mutex_lock(&joycon_input_num_mutex);
mutex_lock(&ctlr->output_mutex);
-@@ -583,6 +644,29 @@ static int joycon_input_create(struct joycon_ctlr *ctlr)
+@@ -650,6 +711,31 @@ 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", d_name,
++ name = devm_kasprintf(dev, GFP_KERNEL, "%s:%s:%s",
++ d_name,
++ "green",
+ joycon_player_led_names[i]);
+ if (!name)
+ return -ENOMEM;
+
+ led = &ctlr->leds[i];
+ led->name = name;
-+ led->brightness = ((i + 1) <= input_num) ? LED_ON : LED_OFF;
-+ led->max_brightness = LED_ON;
++ led->brightness = ((i + 1) <= input_num) ? 1 : 0;
++ led->max_brightness = 1;
+ led->brightness_set_blocking =
+ joycon_player_led_brightness_set;
+ led->flags = LED_CORE_SUSPENDRESUME | LED_HW_PLUGGABLE;
@@ -156,9 +157,9 @@
if (++input_num > 4)
input_num = 1;
mutex_unlock(&joycon_input_num_mutex);
-@@ -759,6 +843,13 @@ static int nintendo_hid_probe(struct hid_device *hdev,
- goto err_close;
- }
+@@ -813,6 +899,13 @@ static int nintendo_hid_probe(struct hid_device *hdev,
+
+ mutex_unlock(&ctlr->output_mutex);
+ /* Initialize the leds */
+ ret = joycon_player_leds_create(ctlr);
@@ -167,9 +168,9 @@
+ goto err_close;
+ }
+
- ctlr->ctlr_state = JOYCON_CTLR_STATE_READ;
-
- hid_dbg(hdev, "probe - success\n");
+ ret = joycon_input_create(ctlr);
+ if (ret) {
+ hid_err(hdev, "Failed to create input device; ret=%d\n", ret);
--
-2.23.0
+2.33.0