Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Backmerge the 4.8 pull request state from Dave - conflicts were
getting out of hand, and Chris has some patches which outright don't
apply without everything merged together again.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 32 insertions, 0 deletions

diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
index 87cf351bab03..d6d071fc3c56 100644
--- a/include/uapi/linux/input-event-codes.h
+++ b/include/uapi/linux/input-event-codes.h
@@ -611,6 +611,37 @@
 #define KEY_KBDINPUTASSIST_ACCEPT               0x264
 #define KEY_KBDINPUTASSIST_CANCEL               0x265
 
+/* Diagonal movement keys */
+#define KEY_RIGHT_UP                    0x266
+#define KEY_RIGHT_DOWN                  0x267
+#define KEY_LEFT_UP                     0x268
+#define KEY_LEFT_DOWN                   0x269
+
+#define KEY_ROOT_MENU                   0x26a /* Show Device's Root Menu */
+/* Show Top Menu of the Media (e.g. DVD) */
+#define KEY_MEDIA_TOP_MENU              0x26b
+#define KEY_NUMERIC_11                  0x26c
+#define KEY_NUMERIC_12                  0x26d
+/*
+ * Toggle Audio Description: refers to an audio service that helps blind and
+ * visually impaired consumers understand the action in a program. Note: in
+ * some countries this is referred to as "Video Description".
+ */
+#define KEY_AUDIO_DESC                  0x26e
+#define KEY_3D_MODE                     0x26f
+#define KEY_NEXT_FAVORITE               0x270
+#define KEY_STOP_RECORD                 0x271
+#define KEY_PAUSE_RECORD                0x272
+#define KEY_VOD                         0x273 /* Video on Demand */
+#define KEY_UNMUTE                      0x274
+#define KEY_FASTREVERSE                 0x275
+#define KEY_SLOWREVERSE                 0x276
+/*
+ * Control a data application associated with the currently viewed channel,
+ * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.)
+ */
+#define KEY_DATA                        0x275
+
 #define BTN_TRIGGER_HAPPY               0x2c0
 #define BTN_TRIGGER_HAPPY1              0x2c0
 #define BTN_TRIGGER_HAPPY2              0x2c1
@@ -749,6 +780,7 @@
 #define SW_ROTATE_LOCK          0x0c  /* set = rotate locked/disabled */
 #define SW_LINEIN_INSERT        0x0d  /* set = inserted */
 #define SW_MUTE_DEVICE          0x0e  /* set = device disabled */
+#define SW_PEN_INSERTED         0x0f  /* set = pen inserted */
 #define SW_MAX                  0x0f
 #define SW_CNT                  (SW_MAX+1)