1 files changed, 64 insertions, 24 deletions

diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 026df601016..40cea334ad1 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -36,6 +36,8 @@
  * The x/y limits are taken from the Synaptics TouchPad interfacing Guide,
  * section 2.3.2, which says that they should be valid regardless of the
  * actual size of the sensor.
+ * Note that newer firmware allows querying device for maximum useable
+ * coordinates.
  */
 #define XMIN_NOMINAL 1472
 #define XMAX_NOMINAL 5472
@@ -137,7 +139,8 @@ static int synaptics_capability(struct psmouse *psmouse)
         if (synaptics_send_cmd(psmouse, SYN_QUE_CAPABILITIES, cap))
                 return -1;
         priv->capabilities = (cap[0] << 16) | (cap[1] << 8) | cap[2];
-        priv->ext_cap = 0;
+        priv->ext_cap = priv->ext_cap_0c = 0;
+
         if (!SYN_CAP_VALID(priv->capabilities))
                 return -1;
 
@@ -150,7 +153,7 @@ static int synaptics_capability(struct psmouse *psmouse)
         if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 1) {
                 if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_CAPAB, cap)) {
                         printk(KERN_ERR "Synaptics claims to have extended capabilities,"
-                               " but I'm not able to read them.");
+                               " but I'm not able to read them.\n");
                 } else {
                         priv->ext_cap = (cap[0] << 16) | (cap[1] << 8) | cap[2];
 
@@ -162,6 +165,16 @@ static int synaptics_capability(struct psmouse *psmouse)
                                 priv->ext_cap &= 0xff0fff;
                 }
         }
+
+        if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 4) {
+                if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_CAPAB_0C, cap)) {
+                        printk(KERN_ERR "Synaptics claims to have extended capability 0x0c,"
+                               " but I'm not able to read it.\n");
+                } else {
+                        priv->ext_cap_0c = (cap[0] << 16) | (cap[1] << 8) | cap[2];
+                }
+        }
+
         return 0;
 }
 
@@ -183,23 +196,33 @@ static int synaptics_identify(struct psmouse *psmouse)
 }
 
 /*
- * Read touchpad resolution
+ * Read touchpad resolution and maximum reported coordinates
  * Resolution is left zero if touchpad does not support the query
  */
 static int synaptics_resolution(struct psmouse *psmouse)
 {
         struct synaptics_data *priv = psmouse->private;
         unsigned char res[3];
+        unsigned char max[3];
 
         if (SYN_ID_MAJOR(priv->identity) < 4)
-                return 0;
 
-        if (synaptics_send_cmd(psmouse, SYN_QUE_RESOLUTION, res))
-                return 0;
+        if (synaptics_send_cmd(psmouse, SYN_QUE_RESOLUTION, res) == 0) {
+                if (res[0] != 0 && (res[1] & 0x80) && res[2] != 0) {
+                        priv->x_res = res[0]; /* x resolution in units/mm */
+                        priv->y_res = res[2]; /* y resolution in units/mm */
+                }
+        }
 
-        if ((res[0] != 0) && (res[1] & 0x80) && (res[2] != 0)) {
-                priv->x_res = res[0]; /* x resolution in units/mm */
-                priv->y_res = res[2]; /* y resolution in units/mm */
+        if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 5 &&
+            SYN_CAP_MAX_DIMENSIONS(priv->ext_cap_0c)) {
+                if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_DIMENSIONS, max)) {
+                        printk(KERN_ERR "Synaptics claims to have dimensions query,"
+                               " but I'm not able to read it.\n");
+                } else {
+                        priv->x_max = (max[0] << 5) | ((max[1] & 0x0f) << 1);
+                        priv->y_max = (max[2] << 5) | ((max[1] & 0xf0) >> 3);
+                }
         }
 
         return 0;
@@ -348,7 +371,15 @@ static void synaptics_parse_hw_state(unsigned char buf[], struct synaptics_data
                 hw->left  = (buf[0] & 0x01) ? 1 : 0;
                 hw->right = (buf[0] & 0x02) ? 1 : 0;
 
-                if (SYN_CAP_MIDDLE_BUTTON(priv->capabilities)) {
+                if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) {
+                        /*
+                         * Clickpad's button is transmitted as middle button,
+                         * however, since it is primary button, we will report
+                         * it as BTN_LEFT.
+                         */
+                        hw->left = ((buf[0] ^ buf[3]) & 0x01) ? 1 : 0;
+
+                } else if (SYN_CAP_MIDDLE_BUTTON(priv->capabilities)) {
                         hw->middle = ((buf[0] ^ buf[3]) & 0x01) ? 1 : 0;
                         if (hw->w == 2)
                                 hw->scroll = (signed char)(buf[1]);
@@ -501,19 +532,20 @@ static int synaptics_validate_byte(unsigned char packet[], int idx, unsigned cha
                 return 0;
 
         switch (pkt_type) {
-                case SYN_NEWABS:
-                case SYN_NEWABS_RELAXED:
-                        return (packet[idx] & newabs_rel_mask[idx]) == newabs_rslt[idx];
 
-                case SYN_NEWABS_STRICT:
-                        return (packet[idx] & newabs_mask[idx]) == newabs_rslt[idx];
+        case SYN_NEWABS:
+        case SYN_NEWABS_RELAXED:
+                return (packet[idx] & newabs_rel_mask[idx]) == newabs_rslt[idx];
 
-                case SYN_OLDABS:
-                        return (packet[idx] & oldabs_mask[idx]) == oldabs_rslt[idx];
+        case SYN_NEWABS_STRICT:
+                return (packet[idx] & newabs_mask[idx]) == newabs_rslt[idx];
 
-                default:
-                        printk(KERN_ERR "synaptics: unknown packet type %d\n", pkt_type);
-                        return 0;
+        case SYN_OLDABS:
+                return (packet[idx] & oldabs_mask[idx]) == oldabs_rslt[idx];
+
+        default:
+                printk(KERN_ERR "synaptics: unknown packet type %d\n", pkt_type);
+                return 0;
         }
 }
 
@@ -559,8 +591,10 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv)
         int i;
 
         __set_bit(EV_ABS, dev->evbit);
-        input_set_abs_params(dev, ABS_X, XMIN_NOMINAL, XMAX_NOMINAL, 0, 0);
-        input_set_abs_params(dev, ABS_Y, YMIN_NOMINAL, YMAX_NOMINAL, 0, 0);
+        input_set_abs_params(dev, ABS_X,
+                             XMIN_NOMINAL, priv->x_max ?: XMAX_NOMINAL, 0, 0);
+        input_set_abs_params(dev, ABS_Y,
+                             YMIN_NOMINAL, priv->y_max ?: YMAX_NOMINAL, 0, 0);
         input_set_abs_params(dev, ABS_PRESSURE, 0, 255, 0, 0);
         __set_bit(ABS_TOOL_WIDTH, dev->absbit);
 
@@ -593,6 +627,12 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv)
 
         dev->absres[ABS_X] = priv->x_res;
         dev->absres[ABS_Y] = priv->y_res;
+
+        if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) {
+                /* Clickpads report only left button */
+                __clear_bit(BTN_RIGHT, dev->keybit);
+                __clear_bit(BTN_MIDDLE, dev->keybit);
+        }
 }
 
 static void synaptics_disconnect(struct psmouse *psmouse)
@@ -697,10 +737,10 @@ int synaptics_init(struct psmouse *psmouse)
 
         priv->pkt_type = SYN_MODEL_NEWABS(priv->model_id) ? SYN_NEWABS : SYN_OLDABS;
 
-        printk(KERN_INFO "Synaptics Touchpad, model: %ld, fw: %ld.%ld, id: %#lx, caps: %#lx/%#lx\n",
+        printk(KERN_INFO "Synaptics Touchpad, model: %ld, fw: %ld.%ld, id: %#lx, caps: %#lx/%#lx/%#lx\n",
                 SYN_ID_MODEL(priv->identity),
                 SYN_ID_MAJOR(priv->identity), SYN_ID_MINOR(priv->identity),
-                priv->model_id, priv->capabilities, priv->ext_cap);
+                priv->model_id, priv->capabilities, priv->ext_cap, priv->ext_cap_0c);
 
         set_input_params(psmouse->dev, priv);