1 files changed, 25 insertions, 2 deletions

diff --git a/drivers/input/mouse/synaptics.h b/drivers/input/mouse/synaptics.h
index ca040aa80fa..622aea8dd7e 100644
--- a/drivers/input/mouse/synaptics.h
+++ b/drivers/input/mouse/synaptics.h
@@ -74,6 +74,8 @@
  * 2    0x04    reduced filtering       firmware does less filtering on
  *                                      position data, driver should watch
  *                                      for noise.
+ * 2    0x08    image sensor            image sensor tracks 5 fingers, but only
+ *                                      reports 2.
  * 2    0x20    report min              query 0x0f gives min coord reported
  */
 #define SYN_CAP_CLICKPAD(ex0c)          ((ex0c) & 0x100000) /* 1-button ClickPad */
@@ -82,6 +84,7 @@
 #define SYN_CAP_MIN_DIMENSIONS(ex0c)    ((ex0c) & 0x002000)
 #define SYN_CAP_ADV_GESTURE(ex0c)       ((ex0c) & 0x080000)
 #define SYN_CAP_REDUCED_FILTERING(ex0c) ((ex0c) & 0x000400)
+#define SYN_CAP_IMAGE_SENSOR(ex0c)      ((ex0c) & 0x000800)
 
 /* synaptics modes query bits */
 #define SYN_MODE_ABSOLUTE(m)            ((m) & (1 << 7))
@@ -112,9 +115,18 @@
 #define SYN_REDUCED_FILTER_FUZZ         8
 
 /*
- * A structure to describe the state of the touchpad hardware (buttons and pad)
+ * A structure to describe which internal touchpad finger slots are being
+ * reported in raw packets.
  */
+struct synaptics_mt_state {
+        int count;                      /* num fingers being tracked */
+        int sgm;                        /* which slot is reported by sgm pkt */
+        int agm;                        /* which slot is reported by agm pkt*/
+};
 
+/*
+ * A structure to describe the state of the touchpad hardware (buttons and pad)
+ */
 struct synaptics_hw_state {
         int x;
         int y;
@@ -127,6 +139,9 @@ struct synaptics_hw_state {
         unsigned int down:1;
         unsigned char ext_buttons;
         signed char scroll;
+
+        /* As reported in last AGM-CONTACT packets */
+        struct synaptics_mt_state mt_state;
 };
 
 struct synaptics_data {
@@ -146,7 +161,15 @@ struct synaptics_data {
 
         struct serio *pt_port;                  /* Pass-through serio port */
 
-        struct synaptics_hw_state mt;           /* current gesture packet */
+        struct synaptics_mt_state mt_state;     /* Current mt finger state */
+        bool mt_state_lost;                     /* mt_state may be incorrect */
+
+        /*
+         * Last received Advanced Gesture Mode (AGM) packet. An AGM packet
+         * contains position data for a second contact, at half resolution.
+         */
+        struct synaptics_hw_state agm;
+        bool agm_pending;                       /* new AGM packet received */
 };
 
 void synaptics_module_init(void);