Input: HID - add more consumer usages

Extend mapping of the consumer usage page in hid-input.c to handle
more cases appearing on new USB keyboards.

Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

1 files changed, 11 insertions, 6 deletions

diff --git a/drivers/usb/input/hid-debug.h b/drivers/usb/input/hid-debug.h
index 789df807b113..ceebab99eff2 100644
--- a/drivers/usb/input/hid-debug.h
+++ b/drivers/usb/input/hid-debug.h
@@ -109,6 +109,7 @@ static const struct hid_usage_entry hid_usage_table[] = {
       {0, 0x03, "ScrollLock"},
       {0, 0x04, "Compose"},
       {0, 0x05, "Kana"},
+      {0, 0x4b, "GenericIndicator"},
   {  9, 0, "Button" },
   { 10, 0, "Ordinal" },
   { 12, 0, "Consumer" },
@@ -591,7 +592,8 @@ static char *keys[KEY_MAX + 1] = {
         [KEY_EXIT] = "Exit",                    [KEY_MOVE] = "Move",
         [KEY_EDIT] = "Edit",                    [KEY_SCROLLUP] = "ScrollUp",
         [KEY_SCROLLDOWN] = "ScrollDown",        [KEY_KPLEFTPAREN] = "KPLeftParenthesis",
-        [KEY_KPRIGHTPAREN] = "KPRightParenthesis", [KEY_F13] = "F13",
+        [KEY_KPRIGHTPAREN] = "KPRightParenthesis", [KEY_NEW] = "New",
+        [KEY_REDO] = "Redo",                    [KEY_F13] = "F13",
         [KEY_F14] = "F14",                      [KEY_F15] = "F15",
         [KEY_F16] = "F16",                      [KEY_F17] = "F17",
         [KEY_F18] = "F18",                      [KEY_F19] = "F19",
@@ -601,15 +603,15 @@ static char *keys[KEY_MAX + 1] = {
         [KEY_PAUSECD] = "PauseCD",              [KEY_PROG3] = "Prog3",
         [KEY_PROG4] = "Prog4",                  [KEY_SUSPEND] = "Suspend",
         [KEY_CLOSE] = "Close",                  [KEY_PLAY] = "Play",
-        [KEY_FASTFORWARD] = "Fast Forward",     [KEY_BASSBOOST] = "Bass Boost",
+        [KEY_FASTFORWARD] = "FastForward",      [KEY_BASSBOOST] = "BassBoost",
         [KEY_PRINT] = "Print",                  [KEY_HP] = "HP",
         [KEY_CAMERA] = "Camera",                [KEY_SOUND] = "Sound",
         [KEY_QUESTION] = "Question",            [KEY_EMAIL] = "Email",
         [KEY_CHAT] = "Chat",                    [KEY_SEARCH] = "Search",
         [KEY_CONNECT] = "Connect",              [KEY_FINANCE] = "Finance",
         [KEY_SPORT] = "Sport",                  [KEY_SHOP] = "Shop",
-        [KEY_ALTERASE] = "Alternate Erase",     [KEY_CANCEL] = "Cancel",
-        [KEY_BRIGHTNESSDOWN] = "Brightness down", [KEY_BRIGHTNESSUP] = "Brightness up",
+        [KEY_ALTERASE] = "AlternateErase",      [KEY_CANCEL] = "Cancel",
+        [KEY_BRIGHTNESSDOWN] = "BrightnessDown", [KEY_BRIGHTNESSUP] = "BrightnessUp",
         [KEY_MEDIA] = "Media",                  [KEY_UNKNOWN] = "Unknown",
         [BTN_0] = "Btn0",                       [BTN_1] = "Btn1",
         [BTN_2] = "Btn2",                       [BTN_3] = "Btn3",
@@ -639,8 +641,8 @@ static char *keys[KEY_MAX + 1] = {
         [BTN_TOOL_AIRBRUSH] = "ToolAirbrush",   [BTN_TOOL_FINGER] = "ToolFinger",
         [BTN_TOOL_MOUSE] = "ToolMouse",         [BTN_TOOL_LENS] = "ToolLens",
         [BTN_TOUCH] = "Touch",                  [BTN_STYLUS] = "Stylus",
-        [BTN_STYLUS2] = "Stylus2",              [BTN_TOOL_DOUBLETAP] = "Tool Doubletap",
-        [BTN_TOOL_TRIPLETAP] = "Tool Tripletap", [BTN_GEAR_DOWN] = "WheelBtn",
+        [BTN_STYLUS2] = "Stylus2",              [BTN_TOOL_DOUBLETAP] = "ToolDoubleTap",
+        [BTN_TOOL_TRIPLETAP] = "ToolTripleTap", [BTN_GEAR_DOWN] = "WheelBtn",
         [BTN_GEAR_UP] = "Gear up",              [KEY_OK] = "Ok",
         [KEY_SELECT] = "Select",                [KEY_GOTO] = "Goto",
         [KEY_CLEAR] = "Clear",                  [KEY_POWER2] = "Power2",
@@ -676,6 +678,9 @@ static char *keys[KEY_MAX + 1] = {
         [KEY_TWEN] = "TWEN",                    [KEY_DEL_EOL] = "DeleteEOL",
         [KEY_DEL_EOS] = "DeleteEOS",            [KEY_INS_LINE] = "InsertLine",
         [KEY_DEL_LINE] = "DeleteLine",
+        [KEY_SEND] = "Send",                    [KEY_REPLY] = "Reply",
+        [KEY_FORWARDMAIL] = "ForwardMail",      [KEY_SAVE] = "Save",
+        [KEY_DOCUMENTS] = "Documents",
 };
 
 static char *relatives[REL_MAX + 1] = {