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

This patch outputs status from T42 touch suppression

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 
ab95b5a309999d2c098daaa9f88d9fcfae7eb516)
Signed-off-by: George G. Davis <george_da...@mentor.com>
[jiada: Replace dev_info() with dev_dbg()]
Signed-off-by: Jiada Wang <jiada_w...@mentor.com>
---
 drivers/input/touchscreen/atmel_mxt_ts.c | 25 ++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c 
b/drivers/input/touchscreen/atmel_mxt_ts.c
index a53985a7736f..f6465edaa57e 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -155,6 +155,9 @@ struct t37_debug {
 #define MXT_RESET_VALUE                0x01
 #define MXT_BACKUP_VALUE       0x55
 
+/* Define for MXT_PROCI_TOUCHSUPPRESSION_T42 */
+#define MXT_T42_MSG_TCHSUP     BIT(0)
+
 /* T100 Multiple Touch Touchscreen */
 #define MXT_T100_CTRL          0
 #define MXT_T100_CFG1          1
@@ -323,6 +326,8 @@ struct mxt_data {
        u8 T9_reportid_max;
        u16 T18_address;
        u8 T19_reportid;
+       u8 T42_reportid_min;
+       u8 T42_reportid_max;
        u16 T44_address;
        u8 T48_reportid;
        u8 T100_reportid_min;
@@ -979,6 +984,17 @@ static void mxt_proc_t100_message(struct mxt_data *data, 
u8 *message)
        data->update_input = true;
 }
 
+static void mxt_proc_t42_messages(struct mxt_data *data, u8 *msg)
+{
+       struct device *dev = &data->client->dev;
+       u8 status = msg[1];
+
+       if (status & MXT_T42_MSG_TCHSUP)
+               dev_dbg(dev, "T42 suppress\n");
+       else
+               dev_dbg(dev, "T42 normal\n");
+}
+
 static int mxt_proc_t48_messages(struct mxt_data *data, u8 *msg)
 {
        struct device *dev = &data->client->dev;
@@ -1006,6 +1022,9 @@ static int mxt_proc_message(struct mxt_data *data, u8 
*message)
 
        if (report_id == data->T6_reportid) {
                mxt_proc_t6_messages(data, message);
+       } else if (report_id >= data->T42_reportid_min
+                  && report_id <= data->T42_reportid_max) {
+               mxt_proc_t42_messages(data, message);
        } else if (report_id == data->T48_reportid) {
                mxt_proc_t48_messages(data, message);
        } else if (!data->input_dev) {
@@ -1686,6 +1705,8 @@ static void mxt_free_object_table(struct mxt_data *data)
        data->T9_reportid_max = 0;
        data->T18_address = 0;
        data->T19_reportid = 0;
+       data->T42_reportid_min = 0;
+       data->T42_reportid_max = 0;
        data->T44_address = 0;
        data->T48_reportid = 0;
        data->T100_reportid_min = 0;
@@ -1763,6 +1784,10 @@ static int mxt_parse_object_table(struct mxt_data *data,
                case MXT_SPT_COMMSCONFIG_T18:
                        data->T18_address = object->start_address;
                        break;
+               case MXT_PROCI_TOUCHSUPPRESSION_T42:
+                       data->T42_reportid_min = min_id;
+                       data->T42_reportid_max = max_id;
+                       break;
                case MXT_SPT_MESSAGECOUNT_T44:
                        data->T44_address = object->start_address;
                        break;
-- 
2.17.1

Reply via email to