[PATCH v1 09/63] Input: atmel_mxt_ts - handle reports from T47 Stylus object

[Jiada Wang]

From: Nick Dyer <nick.d...@itdev.co.uk>

Signed-off-by: Nick Dyer <nick.d...@itdev.co.uk>
Acked-by: Benson Leung <ble...@chromium.org>
Acked-by: Yufeng Shen <mile...@chromium.org>
(cherry picked from ndyer/linux/for-upstream commit 
56405a5ea08eb34cfe83f3121867c9de0a5c48c1)
Signed-off-by: George G. Davis <george_da...@mentor.com>
Signed-off-by: Jiada Wang <jiada_w...@mentor.com>
---
 drivers/input/touchscreen/atmel_mxt_ts.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c 
b/drivers/input/touchscreen/atmel_mxt_ts.c
index 99b87042dfe5..adf63ecf6b8e 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -822,6 +822,7 @@ static void mxt_proc_t9_message(struct mxt_data *data, u8 
*message)
        int area;
        int amplitude;
        u8 vector;
+       int tool;
 
        id = message[0] - data->T9_reportid_min;
        status = message[1];
@@ -835,6 +836,7 @@ static void mxt_proc_t9_message(struct mxt_data *data, u8 
*message)
                y >>= 2;
 
        area = message[5];
+
        amplitude = message[6];
        vector = message[7];
 
@@ -864,12 +866,20 @@ static void mxt_proc_t9_message(struct mxt_data *data, u8 
*message)
                        mxt_input_sync(data);
                }
 
+               /* A size of zero indicates touch is from a linked T47 Stylus */
+               if (area == 0) {
+                       area = MXT_TOUCH_MAJOR_DEFAULT;
+                       tool = MT_TOOL_PEN;
+               } else {
+                       tool = MT_TOOL_FINGER;
+               }
+
                /* if active, pressure must be non-zero */
                if (!amplitude)
                        amplitude = MXT_PRESSURE_DEFAULT;
 
                /* Touch active */
-               input_mt_report_slot_state(input_dev, MT_TOOL_FINGER, 1);
+               input_mt_report_slot_state(input_dev, tool, 1);
                input_report_abs(input_dev, ABS_MT_POSITION_X, x);
                input_report_abs(input_dev, ABS_MT_POSITION_Y, y);
                input_report_abs(input_dev, ABS_MT_PRESSURE, amplitude);
-- 
2.19.2