Input: atmel_mxt_ts - only read messages in mxt_acquire_irq() when necessary

[sfrench/cifs-2.6.git] / drivers / input / touchscreen / atmel_mxt_ts.c

diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index a2189739e30f5d22a5a238573497006a13041d58..6b71b0aff1152f0f50c4bad8a8b6343ccfbc3c0b 100644 (file)
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -20,6 +20,7 @@
 #include <linux/i2c.h>
 #include <linux/input/mt.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/of.h>
 #include <linux/property.h>
 #include <linux/slab.h>
@@ -129,6 +130,7 @@ struct t9_range {
 /* MXT_SPT_COMMSCONFIG_T18 */
 #define MXT_COMMS_CTRL         0
 #define MXT_COMMS_CMD          1
+#define MXT_COMMS_RETRIGEN     BIT(6)
 
 /* MXT_DEBUG_DIAGNOSTIC_T37 */
 #define MXT_DIAGNOSTIC_PAGEUP  0x01
@@ -308,6 +310,7 @@ struct mxt_data {
        struct t7_config t7_cfg;
        struct mxt_dbg dbg;
        struct gpio_desc *reset_gpio;
+       bool use_retrigen_workaround;
 
        /* Cached parameters from object table */
        u16 T5_address;
@@ -318,6 +321,7 @@ struct mxt_data {
        u16 T71_address;
        u8 T9_reportid_min;
        u8 T9_reportid_max;
+       u16 T18_address;
        u8 T19_reportid;
        u16 T44_address;
        u8 T100_reportid_min;
@@ -1190,9 +1194,11 @@ static int mxt_acquire_irq(struct mxt_data *data)
 
        enable_irq(data->irq);
 
-       error = mxt_process_messages_until_invalid(data);
-       if (error)
-               return error;
+       if (data->use_retrigen_workaround) {
+               error = mxt_process_messages_until_invalid(data);
+               if (error)
+                       return error;
+       }
 
        return 0;
 }
@@ -1282,6 +1288,38 @@ static u32 mxt_calculate_crc(u8 *base, off_t start_off, off_t end_off)
        return crc;
 }
 
+static int mxt_check_retrigen(struct mxt_data *data)
+{
+       struct i2c_client *client = data->client;
+       int error;
+       int val;
+       struct irq_data *irqd;
+
+       data->use_retrigen_workaround = false;
+
+       irqd = irq_get_irq_data(data->irq);
+       if (!irqd)
+               return -EINVAL;
+
+       if (irqd_is_level_type(irqd))
+               return 0;
+
+       if (data->T18_address) {
+               error = __mxt_read_reg(client,
+                                      data->T18_address + MXT_COMMS_CTRL,
+                                      1, &val);
+               if (error)
+                       return error;
+
+               if (val & MXT_COMMS_RETRIGEN)
+                       return 0;
+       }
+
+       dev_warn(&client->dev, "Enabling RETRIGEN workaround\n");
+       data->use_retrigen_workaround = true;
+       return 0;
+}
+
 static int mxt_prepare_cfg_mem(struct mxt_data *data, struct mxt_cfg *cfg)
 {
        struct device *dev = &data->client->dev;
@@ -1561,6 +1599,10 @@ static int mxt_update_cfg(struct mxt_data *data, const struct firmware *fw)
 
        mxt_update_crc(data, MXT_COMMAND_BACKUPNV, MXT_BACKUP_VALUE);
 
+       ret = mxt_check_retrigen(data);
+       if (ret)
+               goto release_mem;
+
        ret = mxt_soft_reset(data);
        if (ret)
                goto release_mem;
@@ -1604,6 +1646,7 @@ static void mxt_free_object_table(struct mxt_data *data)
        data->T71_address = 0;
        data->T9_reportid_min = 0;
        data->T9_reportid_max = 0;
+       data->T18_address = 0;
        data->T19_reportid = 0;
        data->T44_address = 0;
        data->T100_reportid_min = 0;
@@ -1678,6 +1721,9 @@ static int mxt_parse_object_table(struct mxt_data *data,
                                                object->num_report_ids - 1;
                        data->num_touchids = object->num_report_ids;
                        break;
+               case MXT_SPT_COMMSCONFIG_T18:
+                       data->T18_address = object->start_address;
+                       break;
                case MXT_SPT_MESSAGECOUNT_T44:
                        data->T44_address = object->start_address;
                        break;
@@ -2141,6 +2187,10 @@ static int mxt_initialize(struct mxt_data *data)
        if (error)
                return error;
 
+       error = mxt_check_retrigen(data);
+       if (error)
+               return error;
+
        error = request_firmware_nowait(THIS_MODULE, true, MXT_CFG_NAME,
                                        &client->dev, GFP_KERNEL, data,
                                        mxt_config_cb);