Merge tag 'v3.11' into next

[platform/adaptation/renesas_rcar/renesas_kernel.git] / include / uapi / linux / input.h

diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
index 2fb6fae..d08abf9 100644 (file)
--- a/include/uapi/linux/input.h
+++ b/include/uapi/linux/input.h
@@ -508,11 +508,15 @@ struct input_keymap_entry {
 #define BTN_DEAD               0x12f
 
 #define BTN_GAMEPAD            0x130
-#define BTN_A                  0x130
-#define BTN_B                  0x131
+#define BTN_SOUTH              0x130
+#define BTN_A                  BTN_SOUTH
+#define BTN_EAST               0x131
+#define BTN_B                  BTN_EAST
 #define BTN_C                  0x132
-#define BTN_X                  0x133
-#define BTN_Y                  0x134
+#define BTN_NORTH              0x133
+#define BTN_X                  BTN_NORTH
+#define BTN_WEST               0x134
+#define BTN_Y                  BTN_WEST
 #define BTN_Z                  0x135
 #define BTN_TL                 0x136
 #define BTN_TR                 0x137
@@ -709,6 +713,11 @@ struct input_keymap_entry {
 #define KEY_ATTENDANT_TOGGLE   0x21d   /* Attendant call on or off */
 #define KEY_LIGHTS_TOGGLE      0x21e   /* Reading light on or off */
 
+#define BTN_DPAD_UP            0x220
+#define BTN_DPAD_DOWN          0x221
+#define BTN_DPAD_LEFT          0x222
+#define BTN_DPAD_RIGHT         0x223
+
 #define BTN_TRIGGER_HAPPY              0x2c0
 #define BTN_TRIGGER_HAPPY1             0x2c0
 #define BTN_TRIGGER_HAPPY2             0x2c1