Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (58 commits)
  Input: wacom_w8001 - support pen or touch only devices
  Input: wacom_w8001 - use __set_bit to set keybits
  Input: bu21013_ts - fix misuse of logical operation in place of bitop
  Input: i8042 - add Acer Aspire 5100 to the Dritek list
  Input: wacom - add support for digitizer in Lenovo W700
  Input: psmouse - disable the synaptics extension on OLPC machines
  Input: psmouse - fix up Synaptics comment
  Input: synaptics - ignore bogus mt packet
  Input: synaptics - add multi-finger and semi-mt support
  Input: synaptics - report clickpad property
  input: mt: Document interface updates
  Input: fix double equality sign in uevent
  Input: introduce device properties
  hid: egalax: Add support for Wetab (726b)
  Input: include MT library as source for kerneldoc
  MAINTAINERS: Update input-mt entry
  hid: egalax: Add support for Samsung NB30 netbook
  hid: egalax: Document the new devices in Kconfig
  hid: egalax: Add support for Wetab
  hid: egalax: Convert to MT slots
  ...

Fixed up trivial conflict in drivers/input/keyboard/Kconfig

1 files changed, 21 insertions, 17 deletions

diff --git a/include/linux/input.h b/include/linux/input.h
index f7a6e1966df3..c4e9d91ec979 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -112,6 +112,7 @@ struct input_keymap_entry {
 #define EVIOCGNAME(len)         _IOC(_IOC_READ, 'E', 0x06, len)         /* get device name */
 #define EVIOCGPHYS(len)         _IOC(_IOC_READ, 'E', 0x07, len)         /* get physical location */
 #define EVIOCGUNIQ(len)         _IOC(_IOC_READ, 'E', 0x08, len)         /* get unique identifier */
+#define EVIOCGPROP(len)         _IOC(_IOC_READ, 'E', 0x09, len)         /* get device properties */
 
 #define EVIOCGKEY(len)          _IOC(_IOC_READ, 'E', 0x18, len)         /* get global key state */
 #define EVIOCGLED(len)          _IOC(_IOC_READ, 'E', 0x19, len)         /* get all LEDs */
@@ -129,6 +130,18 @@ struct input_keymap_entry {
 #define EVIOCGRAB               _IOW('E', 0x90, int)                    /* Grab/Release device */
 
 /*
+ * Device properties and quirks
+ */
+
+#define INPUT_PROP_POINTER              0x00    /* needs a pointer */
+#define INPUT_PROP_DIRECT               0x01    /* direct input devices */
+#define INPUT_PROP_BUTTONPAD            0x02    /* has button(s) under pad */
+#define INPUT_PROP_SEMI_MT              0x03    /* touch rectangle only */
+
+#define INPUT_PROP_MAX                  0x1f
+#define INPUT_PROP_CNT                  (INPUT_PROP_MAX + 1)
+
+/*
  * Event types
  */
 
@@ -760,11 +773,12 @@ struct input_keymap_entry {
 #define ABS_MT_BLOB_ID          0x38    /* Group a set of packets as a blob */
 #define ABS_MT_TRACKING_ID      0x39    /* Unique ID of initiated contact */
 #define ABS_MT_PRESSURE         0x3a    /* Pressure on contact area */
+#define ABS_MT_DISTANCE         0x3b    /* Contact hover distance */
 
 #ifdef __KERNEL__
 /* Implementation details, userspace should not care about these */
 #define ABS_MT_FIRST            ABS_MT_TOUCH_MAJOR
-#define ABS_MT_LAST             ABS_MT_PRESSURE
+#define ABS_MT_LAST             ABS_MT_DISTANCE
 #endif
 
 #define ABS_MAX                 0x3f
@@ -875,6 +889,7 @@ struct input_keymap_entry {
  */
 #define MT_TOOL_FINGER          0
 #define MT_TOOL_PEN             1
+#define MT_TOOL_MAX             1
 
 /*
  * Values describing the status of a force-feedback effect
@@ -1110,19 +1125,12 @@ struct ff_effect {
 #include <linux/mod_devicetable.h>
 
 /**
- * struct input_mt_slot - represents the state of an input MT slot
- * @abs: holds current values of ABS_MT axes for this slot
- */
-struct input_mt_slot {
-        int abs[ABS_MT_LAST - ABS_MT_FIRST + 1];
-};
-
-/**
  * struct input_dev - represents an input device
  * @name: name of the device
  * @phys: physical path to the device in the system hierarchy
  * @uniq: unique identification code for the device (if device has it)
  * @id: id of the device (struct input_id)
+ * @propbit: bitmap of device properties and quirks
  * @evbit: bitmap of types of events supported by the device (EV_KEY,
  *      EV_REL, etc.)
  * @keybit: bitmap of keys/buttons this device has
@@ -1157,6 +1165,7 @@ struct input_mt_slot {
  *      of tracked contacts
  * @mtsize: number of MT slots the device uses
  * @slot: MT slot currently being transmitted
+ * @trkid: stores MT tracking ID for the current contact
  * @absinfo: array of &struct input_absinfo elements holding information
  *      about absolute axes (current value, min, max, flat, fuzz,
  *      resolution)
@@ -1205,6 +1214,8 @@ struct input_dev {
         const char *uniq;
         struct input_id id;
 
+        unsigned long propbit[BITS_TO_LONGS(INPUT_PROP_CNT)];
+
         unsigned long evbit[BITS_TO_LONGS(EV_CNT)];
         unsigned long keybit[BITS_TO_LONGS(KEY_CNT)];
         unsigned long relbit[BITS_TO_LONGS(REL_CNT)];
@@ -1241,6 +1252,7 @@ struct input_dev {
         struct input_mt_slot *mt;
         int mtsize;
         int slot;
+        int trkid;
 
         struct input_absinfo *absinfo;
 
@@ -1490,11 +1502,6 @@ static inline void input_mt_sync(struct input_dev *dev)
         input_event(dev, EV_SYN, SYN_MT_REPORT, 0);
 }
 
-static inline void input_mt_slot(struct input_dev *dev, int slot)
-{
-        input_event(dev, EV_ABS, ABS_MT_SLOT, slot);
-}
-
 void input_set_capability(struct input_dev *dev, unsigned int type, unsigned int code);
 
 /**
@@ -1607,8 +1614,5 @@ int input_ff_erase(struct input_dev *dev, int effect_id, struct file *file);
 int input_ff_create_memless(struct input_dev *dev, void *data,
                 int (*play_effect)(struct input_dev *, void *, struct ff_effect *));
 
-int input_mt_create_slots(struct input_dev *dev, unsigned int num_slots);
-void input_mt_destroy_slots(struct input_dev *dev);
-
 #endif
 #endif