1 files changed, 36 insertions, 2 deletions

diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index c703d53be3a..d5b390f75c9 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -139,6 +139,35 @@ static int synaptics_model_id(struct psmouse *psmouse)
 }
 
 /*
+ * Read the board id from the touchpad
+ * The board id is encoded in the "QUERY MODES" response
+ */
+static int synaptics_board_id(struct psmouse *psmouse)
+{
+        struct synaptics_data *priv = psmouse->private;
+        unsigned char bid[3];
+
+        if (synaptics_send_cmd(psmouse, SYN_QUE_MODES, bid))
+                return -1;
+        priv->board_id = ((bid[0] & 0xfc) << 6) | bid[1];
+        return 0;
+}
+
+/*
+ * Read the firmware id from the touchpad
+ */
+static int synaptics_firmware_id(struct psmouse *psmouse)
+{
+        struct synaptics_data *priv = psmouse->private;
+        unsigned char fwid[3];
+
+        if (synaptics_send_cmd(psmouse, SYN_QUE_FIRMWARE_ID, fwid))
+                return -1;
+        priv->firmware_id = (fwid[0] << 16) | (fwid[1] << 8) | fwid[2];
+        return 0;
+}
+
+/*
  * Read the capability-bits from the touchpad
  * see also the SYN_CAP_* macros
  */
@@ -261,6 +290,10 @@ static int synaptics_query_hardware(struct psmouse *psmouse)
                 return -1;
         if (synaptics_model_id(psmouse))
                 return -1;
+        if (synaptics_firmware_id(psmouse))
+                return -1;
+        if (synaptics_board_id(psmouse))
+                return -1;
         if (synaptics_capability(psmouse))
                 return -1;
         if (synaptics_resolution(psmouse))
@@ -1435,11 +1468,12 @@ static int __synaptics_init(struct psmouse *psmouse, bool absolute_mode)
         priv->pkt_type = SYN_MODEL_NEWABS(priv->model_id) ? SYN_NEWABS : SYN_OLDABS;
 
         psmouse_info(psmouse,
-                     "Touchpad model: %ld, fw: %ld.%ld, id: %#lx, caps: %#lx/%#lx/%#lx\n",
+                     "Touchpad model: %ld, fw: %ld.%ld, id: %#lx, caps: %#lx/%#lx/%#lx, board id: %lu, fw id: %lu\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->ext_cap_0c);
+                     priv->capabilities, priv->ext_cap, priv->ext_cap_0c,
+                     priv->board_id, priv->firmware_id);
 
         set_input_params(psmouse->dev, priv);