include: sync with kernel v4.12

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/include/linux/input-event-codes.h b/include/linux/input-event-codes.h
index 0d42d2576fab9a487f35c80bac0929517154c8f0..9771e4f870bb9990487a14de77cc15b4a4c97b4c 100644 (file)
--- a/include/linux/input-event-codes.h
+++ b/include/linux/input-event-codes.h
@@ -641,6 +641,7 @@
  * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.)
  */
 #define KEY_DATA                       0x277
+#define KEY_ONSCREEN_KEYBOARD          0x278
 
 #define BTN_TRIGGER_HAPPY              0x2c0
 #define BTN_TRIGGER_HAPPY1             0x2c0

diff --git a/include/linux/input.h b/include/linux/input.h
index 6b4bace6657fd5ac4d7dcf499b0a638ae9a69dbe..c5c8bc46bcf9277b30e70ce9ad7bdc3a3edd7332 100644 (file)
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -59,9 +59,14 @@ struct input_id {
  * Note that input core does not clamp reported values to the
  * [minimum, maximum] limits, such task is left to userspace.
  *
- * Resolution for main axes (ABS_X, ABS_Y, ABS_Z) is reported in
- * units per millimeter (units/mm), resolution for rotational axes
- * (ABS_RX, ABS_RY, ABS_RZ) is reported in units per radian.
+ * The default resolution for main axes (ABS_X, ABS_Y, ABS_Z)
+ * is reported in units per millimeter (units/mm), resolution
+ * for rotational axes (ABS_RX, ABS_RY, ABS_RZ) is reported
+ * in units per radian.
+ * When INPUT_PROP_ACCELEROMETER is set the resolution changes.
+ * The main axes (ABS_X, ABS_Y, ABS_Z) are then reported in
+ * in units per g (units/g) and in units per degree per second
+ * (units/deg/s) for rotational axes (ABS_RX, ABS_RY, ABS_RZ).
  */
 struct input_absinfo {
        __s32 value;
@@ -179,7 +184,7 @@ struct input_mask {
  * The default event mask for a client has all bits set, i.e. all events
  * are forwarded to the client. If the kernel is queried for an unknown
  * event type or if the receive buffer is larger than the number of
- * event codes known to the kernel, the kernel may return zeroes for those
+ * event codes known to the kernel, the kernel returns all zeroes for those
  * codes.
  *
  * At maximum, codes_size bytes are copied.
@@ -202,7 +207,7 @@ struct input_mask {
  * is unknown to the kernel, or if the number of event codes specified in
  * the mask is bigger than what is known to the kernel, the ioctl is still
  * accepted and applied. However, any unknown codes are left untouched and
- * may be cleared. That means, the kernel always filters unknown codes
+ * stay cleared. That means, the kernel always filters unknown codes
  * regardless of what the client requests.  If the new mask doesn't cover
  * all known event-codes, all remaining codes are automatically cleared and
  * thus filtered.