HID: nintendo: fix gencon button events map

This fixes the button event map to match the 3-button recommendation
as well as the redundant 'z' in the button map events for the Sega
MD/Gen 6 Button.

Signed-off-by: Ryan McClelland <rymcclel@gmail.com>
Reviewed-by: Daniel J. Ogorchock <djogorchock@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>

diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c
index 11ac246176ae118aef77fb8b68f4b57286a6225d..839d5bcd72b1edb23b5881a0bba0187673308989 100644 (file)
--- a/drivers/hid/hid-nintendo.c
+++ b/drivers/hid/hid-nintendo.c
@@ -457,13 +457,13 @@ static const struct joycon_ctlr_button_mapping snescon_button_mappings[] = {
 };
 
 static const struct joycon_ctlr_button_mapping gencon_button_mappings[] = {
-       { BTN_A,        JC_BTN_A,       },
-       { BTN_B,        JC_BTN_B,       },
-       { BTN_C,        JC_BTN_R,       },
-       { BTN_X,        JC_BTN_X,       }, /* MD/GEN 6B Only */
-       { BTN_Y,        JC_BTN_Y,       }, /* MD/GEN 6B Only */
-       { BTN_Z,        JC_BTN_L,       }, /* MD/GEN 6B Only */
-       { BTN_SELECT,   JC_BTN_ZR,      },
+       { BTN_WEST,     JC_BTN_A,       }, /* A */
+       { BTN_SOUTH,    JC_BTN_B,       }, /* B */
+       { BTN_EAST,     JC_BTN_R,       }, /* C */
+       { BTN_TL,       JC_BTN_X,       }, /* X MD/GEN 6B Only */
+       { BTN_NORTH,    JC_BTN_Y,       }, /* Y MD/GEN 6B Only */
+       { BTN_TR,       JC_BTN_L,       }, /* Z MD/GEN 6B Only */
+       { BTN_SELECT,   JC_BTN_ZR,      }, /* Mode */
        { BTN_START,    JC_BTN_PLUS,    },
        { BTN_MODE,     JC_BTN_HOME,    },
        { BTN_Z,        JC_BTN_CAP,     },