Input: atmel_mxt_ts - add support for dynamic message size
[pandora-kernel.git] / drivers / input / touchscreen / atmel_mxt_ts.c
index a704007..215ffe1 100644 (file)
@@ -2,6 +2,9 @@
  * Atmel maXTouch Touchscreen driver
  *
  * Copyright (C) 2010 Samsung Electronics Co.Ltd
+ * Copyright (C) 2011-2014 Atmel Corporation
+ * Copyright (C) 2012 Google, Inc.
+ *
  * Author: Joonyoung Shim <jy0922.shim@samsung.com>
  *
  * This program is free software; you can redistribute  it and/or modify it
  */
 
 #include <linux/module.h>
+#include <linux/init.h>
+#include <linux/completion.h>
 #include <linux/delay.h>
 #include <linux/firmware.h>
 #include <linux/i2c.h>
 #include <linux/i2c/atmel_mxt_ts.h>
 #include <linux/input/mt.h>
 #include <linux/interrupt.h>
+#include <linux/of.h>
 #include <linux/slab.h>
 
 /* Version */
 #define MXT_VER_21             21
 #define MXT_VER_22             22
 
-/* Slave addresses */
-#define MXT_APP_LOW            0x4a
-#define MXT_APP_HIGH           0x4b
-#define MXT_BOOT_LOW           0x24
-#define MXT_BOOT_HIGH          0x25
-
-/* Firmware */
+/* Firmware files */
 #define MXT_FW_NAME            "maxtouch.fw"
+#define MXT_CFG_NAME           "maxtouch.cfg"
+#define MXT_CFG_MAGIC          "OBP_RAW V1"
 
 /* Registers */
 #define MXT_INFO               0x00
@@ -46,6 +48,8 @@
 #define MXT_OBJECT_START       0x07
 
 #define MXT_OBJECT_SIZE                6
+#define MXT_INFO_CHECKSUM_SIZE 3
+#define MXT_MAX_BLOCK_WRITE    256
 
 /* Object types */
 #define MXT_DEBUG_DIAGNOSTIC_T37       37
@@ -76,6 +80,9 @@
 #define MXT_SPT_MESSAGECOUNT_T44       44
 #define MXT_SPT_CTECONFIG_T46          46
 
+/* MXT_GEN_MESSAGE_T5 object */
+#define MXT_RPTID_NOMSG                0xff
+
 /* MXT_GEN_COMMAND_T6 field */
 #define MXT_COMMAND_RESET      0
 #define MXT_COMMAND_BACKUPNV   1
@@ -83,6 +90,9 @@
 #define MXT_COMMAND_REPORTALL  3
 #define MXT_COMMAND_DIAGNOSTIC 5
 
+/* Define for T6 status byte */
+#define MXT_T6_STATUS_RESET    (1 << 7)
+
 /* MXT_GEN_POWER_T7 field */
 #define MXT_POWER_IDLEACQINT   0
 #define MXT_POWER_ACTVACQINT   1
 
 /* MXT_TOUCH_MULTI_T9 field */
 #define MXT_TOUCH_CTRL         0
-#define MXT_TOUCH_XORIGIN      1
-#define MXT_TOUCH_YORIGIN      2
-#define MXT_TOUCH_XSIZE                3
-#define MXT_TOUCH_YSIZE                4
-#define MXT_TOUCH_BLEN         6
-#define MXT_TOUCH_TCHTHR       7
-#define MXT_TOUCH_TCHDI                8
-#define MXT_TOUCH_ORIENT       9
-#define MXT_TOUCH_MOVHYSTI     11
-#define MXT_TOUCH_MOVHYSTN     12
-#define MXT_TOUCH_NUMTOUCH     14
-#define MXT_TOUCH_MRGHYST      15
-#define MXT_TOUCH_MRGTHR       16
-#define MXT_TOUCH_AMPHYST      17
-#define MXT_TOUCH_XRANGE_LSB   18
-#define MXT_TOUCH_XRANGE_MSB   19
-#define MXT_TOUCH_YRANGE_LSB   20
-#define MXT_TOUCH_YRANGE_MSB   21
-#define MXT_TOUCH_XLOCLIP      22
-#define MXT_TOUCH_XHICLIP      23
-#define MXT_TOUCH_YLOCLIP      24
-#define MXT_TOUCH_YHICLIP      25
-#define MXT_TOUCH_XEDGECTRL    26
-#define MXT_TOUCH_XEDGEDIST    27
-#define MXT_TOUCH_YEDGECTRL    28
-#define MXT_TOUCH_YEDGEDIST    29
-#define MXT_TOUCH_JUMPLIMIT    30
+#define MXT_T9_ORIENT          9
+#define MXT_T9_RANGE           18
+
+/* MXT_TOUCH_MULTI_T9 status */
+#define MXT_T9_UNGRIP          (1 << 0)
+#define MXT_T9_SUPPRESS                (1 << 1)
+#define MXT_T9_AMP             (1 << 2)
+#define MXT_T9_VECTOR          (1 << 3)
+#define MXT_T9_MOVE            (1 << 4)
+#define MXT_T9_RELEASE         (1 << 5)
+#define MXT_T9_PRESS           (1 << 6)
+#define MXT_T9_DETECT          (1 << 7)
+
+struct t9_range {
+       u16 x;
+       u16 y;
+} __packed;
+
+/* MXT_TOUCH_MULTI_T9 orient */
+#define MXT_T9_ORIENT_SWITCH   (1 << 0)
 
 /* MXT_PROCI_GRIPFACE_T20 field */
 #define MXT_GRIPFACE_CTRL      0
 
 /* Define for MXT_GEN_COMMAND_T6 */
 #define MXT_BOOT_VALUE         0xa5
+#define MXT_RESET_VALUE                0x01
 #define MXT_BACKUP_VALUE       0x55
+
+/* Delay times */
 #define MXT_BACKUP_TIME                50      /* msec */
 #define MXT_RESET_TIME         200     /* msec */
-
-#define MXT_FWRESET_TIME       175     /* msec */
-
-/* MXT_SPT_GPIOPWM_T19 field */
-#define MXT_GPIO0_MASK         0x04
-#define MXT_GPIO1_MASK         0x08
-#define MXT_GPIO2_MASK         0x10
-#define MXT_GPIO3_MASK         0x20
+#define MXT_RESET_TIMEOUT      3000    /* msec */
+#define MXT_CRC_TIMEOUT                1000    /* msec */
+#define MXT_FW_RESET_TIME      3000    /* msec */
+#define MXT_FW_CHG_TIMEOUT     300     /* msec */
 
 /* Command to unlock bootloader */
 #define MXT_UNLOCK_CMD_MSB     0xaa
 #define MXT_FRAME_CRC_PASS     0x04
 #define MXT_APP_CRC_FAIL       0x40    /* valid 7 8 bit only */
 #define MXT_BOOT_STATUS_MASK   0x3f
-
-/* Touch status */
-#define MXT_UNGRIP             (1 << 0)
-#define MXT_SUPPRESS           (1 << 1)
-#define MXT_AMP                        (1 << 2)
-#define MXT_VECTOR             (1 << 3)
-#define MXT_MOVE               (1 << 4)
-#define MXT_RELEASE            (1 << 5)
-#define MXT_PRESS              (1 << 6)
-#define MXT_DETECT             (1 << 7)
-
-/* Touch orient bits */
-#define MXT_XY_SWITCH          (1 << 0)
-#define MXT_X_INVERT           (1 << 1)
-#define MXT_Y_INVERT           (1 << 2)
+#define MXT_BOOT_EXTENDED_ID   (1 << 5)
+#define MXT_BOOT_ID_MASK       0x1f
 
 /* Touchscreen absolute values */
 #define MXT_MAX_AREA           0xff
@@ -232,16 +221,11 @@ struct mxt_info {
 struct mxt_object {
        u8 type;
        u16 start_address;
-       u8 size;                /* Size of each instance - 1 */
-       u8 instances;           /* Number of instances - 1 */
+       u8 size_minus_one;
+       u8 instances_minus_one;
        u8 num_report_ids;
 } __packed;
 
-struct mxt_message {
-       u8 reportid;
-       u8 message[7];
-};
-
 /* Each client has this additional data */
 struct mxt_data {
        struct i2c_client *client;
@@ -250,19 +234,45 @@ struct mxt_data {
        const struct mxt_platform_data *pdata;
        struct mxt_object *object_table;
        struct mxt_info info;
-       bool is_tp;
-
        unsigned int irq;
        unsigned int max_x;
        unsigned int max_y;
+       bool in_bootloader;
+       u16 mem_size;
+       u32 config_crc;
+       u32 info_crc;
+       u8 bootloader_addr;
+       u8 *msg_buf;
 
        /* Cached parameters from object table */
+       u8 T5_msg_size;
        u8 T6_reportid;
+       u16 T6_address;
+       u16 T7_address;
        u8 T9_reportid_min;
        u8 T9_reportid_max;
        u8 T19_reportid;
+
+       /* for fw update in bootloader */
+       struct completion bl_completion;
+
+       /* for reset handling */
+       struct completion reset_completion;
+
+       /* for config update handling */
+       struct completion crc_completion;
 };
 
+static size_t mxt_obj_size(const struct mxt_object *obj)
+{
+       return obj->size_minus_one + 1;
+}
+
+static size_t mxt_obj_instances(const struct mxt_object *obj)
+{
+       return obj->instances_minus_one + 1;
+}
+
 static bool mxt_object_readable(unsigned int type)
 {
        switch (type) {
@@ -296,98 +306,233 @@ static bool mxt_object_readable(unsigned int type)
        }
 }
 
-static bool mxt_object_writable(unsigned int type)
+static void mxt_dump_message(struct mxt_data *data, u8 *message)
 {
-       switch (type) {
-       case MXT_GEN_COMMAND_T6:
-       case MXT_GEN_POWER_T7:
-       case MXT_GEN_ACQUIRE_T8:
-       case MXT_TOUCH_MULTI_T9:
-       case MXT_TOUCH_KEYARRAY_T15:
-       case MXT_TOUCH_PROXIMITY_T23:
-       case MXT_TOUCH_PROXKEY_T52:
-       case MXT_PROCI_GRIPFACE_T20:
-       case MXT_PROCG_NOISE_T22:
-       case MXT_PROCI_ONETOUCH_T24:
-       case MXT_PROCI_TWOTOUCH_T27:
-       case MXT_PROCI_GRIP_T40:
-       case MXT_PROCI_PALM_T41:
-       case MXT_PROCI_TOUCHSUPPRESSION_T42:
-       case MXT_PROCI_STYLUS_T47:
-       case MXT_PROCG_NOISESUPPRESSION_T48:
-       case MXT_SPT_COMMSCONFIG_T18:
-       case MXT_SPT_GPIOPWM_T19:
-       case MXT_SPT_SELFTEST_T25:
-       case MXT_SPT_CTECONFIG_T28:
-       case MXT_SPT_DIGITIZER_T43:
-       case MXT_SPT_CTECONFIG_T46:
-               return true;
+       dev_dbg(&data->client->dev, "message: %*ph\n",
+               data->T5_msg_size, message);
+}
+
+static int mxt_wait_for_completion(struct mxt_data *data,
+                                  struct completion *comp,
+                                  unsigned int timeout_ms)
+{
+       struct device *dev = &data->client->dev;
+       unsigned long timeout = msecs_to_jiffies(timeout_ms);
+       long ret;
+
+       ret = wait_for_completion_interruptible_timeout(comp, timeout);
+       if (ret < 0) {
+               return ret;
+       } else if (ret == 0) {
+               dev_err(dev, "Wait for completion timed out.\n");
+               return -ETIMEDOUT;
+       }
+       return 0;
+}
+
+static int mxt_bootloader_read(struct mxt_data *data,
+                              u8 *val, unsigned int count)
+{
+       int ret;
+       struct i2c_msg msg;
+
+       msg.addr = data->bootloader_addr;
+       msg.flags = data->client->flags & I2C_M_TEN;
+       msg.flags |= I2C_M_RD;
+       msg.len = count;
+       msg.buf = val;
+
+       ret = i2c_transfer(data->client->adapter, &msg, 1);
+
+       if (ret == 1) {
+               ret = 0;
+       } else {
+               ret = ret < 0 ? ret : -EIO;
+               dev_err(&data->client->dev, "%s: i2c recv failed (%d)\n",
+                       __func__, ret);
+       }
+
+       return ret;
+}
+
+static int mxt_bootloader_write(struct mxt_data *data,
+                               const u8 * const val, unsigned int count)
+{
+       int ret;
+       struct i2c_msg msg;
+
+       msg.addr = data->bootloader_addr;
+       msg.flags = data->client->flags & I2C_M_TEN;
+       msg.len = count;
+       msg.buf = (u8 *)val;
+
+       ret = i2c_transfer(data->client->adapter, &msg, 1);
+       if (ret == 1) {
+               ret = 0;
+       } else {
+               ret = ret < 0 ? ret : -EIO;
+               dev_err(&data->client->dev, "%s: i2c send failed (%d)\n",
+                       __func__, ret);
+       }
+
+       return ret;
+}
+
+static int mxt_lookup_bootloader_address(struct mxt_data *data, bool retry)
+{
+       u8 appmode = data->client->addr;
+       u8 bootloader;
+
+       switch (appmode) {
+       case 0x4a:
+       case 0x4b:
+               /* Chips after 1664S use different scheme */
+               if (retry || data->info.family_id >= 0xa2) {
+                       bootloader = appmode - 0x24;
+                       break;
+               }
+               /* Fall through for normal case */
+       case 0x4c:
+       case 0x4d:
+       case 0x5a:
+       case 0x5b:
+               bootloader = appmode - 0x26;
+               break;
        default:
-               return false;
+               dev_err(&data->client->dev,
+                       "Appmode i2c address 0x%02x not found\n",
+                       appmode);
+               return -EINVAL;
        }
+
+       data->bootloader_addr = bootloader;
+       return 0;
+}
+
+static int mxt_probe_bootloader(struct mxt_data *data, bool retry)
+{
+       struct device *dev = &data->client->dev;
+       int ret;
+       u8 val;
+       bool crc_failure;
+
+       ret = mxt_lookup_bootloader_address(data, retry);
+       if (ret)
+               return ret;
+
+       ret = mxt_bootloader_read(data, &val, 1);
+       if (ret)
+               return ret;
+
+       /* Check app crc fail mode */
+       crc_failure = (val & ~MXT_BOOT_STATUS_MASK) == MXT_APP_CRC_FAIL;
+
+       dev_err(dev, "Detected bootloader, status:%02X%s\n",
+                       val, crc_failure ? ", APP_CRC_FAIL" : "");
+
+       return 0;
 }
 
-static void mxt_dump_message(struct device *dev,
-                            struct mxt_message *message)
+static u8 mxt_get_bootloader_version(struct mxt_data *data, u8 val)
 {
-       dev_dbg(dev, "reportid: %u\tmessage: %*ph\n",
-               message->reportid, 7, message->message);
+       struct device *dev = &data->client->dev;
+       u8 buf[3];
+
+       if (val & MXT_BOOT_EXTENDED_ID) {
+               if (mxt_bootloader_read(data, &buf[0], 3) != 0) {
+                       dev_err(dev, "%s: i2c failure\n", __func__);
+                       return val;
+               }
+
+               dev_dbg(dev, "Bootloader ID:%d Version:%d\n", buf[1], buf[2]);
+
+               return buf[0];
+       } else {
+               dev_dbg(dev, "Bootloader ID:%d\n", val & MXT_BOOT_ID_MASK);
+
+               return val;
+       }
 }
 
-static int mxt_check_bootloader(struct i2c_client *client,
-                                    unsigned int state)
+static int mxt_check_bootloader(struct mxt_data *data, unsigned int state,
+                               bool wait)
 {
+       struct device *dev = &data->client->dev;
        u8 val;
+       int ret;
 
 recheck:
-       if (i2c_master_recv(client, &val, 1) != 1) {
-               dev_err(&client->dev, "%s: i2c recv failed\n", __func__);
-               return -EIO;
+       if (wait) {
+               /*
+                * In application update mode, the interrupt
+                * line signals state transitions. We must wait for the
+                * CHG assertion before reading the status byte.
+                * Once the status byte has been read, the line is deasserted.
+                */
+               ret = mxt_wait_for_completion(data, &data->bl_completion,
+                                             MXT_FW_CHG_TIMEOUT);
+               if (ret) {
+                       /*
+                        * TODO: handle -ERESTARTSYS better by terminating
+                        * fw update process before returning to userspace
+                        * by writing length 0x000 to device (iff we are in
+                        * WAITING_FRAME_DATA state).
+                        */
+                       dev_err(dev, "Update wait error %d\n", ret);
+                       return ret;
+               }
        }
 
+       ret = mxt_bootloader_read(data, &val, 1);
+       if (ret)
+               return ret;
+
+       if (state == MXT_WAITING_BOOTLOAD_CMD)
+               val = mxt_get_bootloader_version(data, val);
+
        switch (state) {
        case MXT_WAITING_BOOTLOAD_CMD:
        case MXT_WAITING_FRAME_DATA:
+       case MXT_APP_CRC_FAIL:
                val &= ~MXT_BOOT_STATUS_MASK;
                break;
        case MXT_FRAME_CRC_PASS:
-               if (val == MXT_FRAME_CRC_CHECK)
+               if (val == MXT_FRAME_CRC_CHECK) {
                        goto recheck;
+               } else if (val == MXT_FRAME_CRC_FAIL) {
+                       dev_err(dev, "Bootloader CRC fail\n");
+                       return -EINVAL;
+               }
                break;
        default:
                return -EINVAL;
        }
 
        if (val != state) {
-               dev_err(&client->dev, "Unvalid bootloader mode state\n");
+               dev_err(dev, "Invalid bootloader state %02X != %02X\n",
+                       val, state);
                return -EINVAL;
        }
 
        return 0;
 }
 
-static int mxt_unlock_bootloader(struct i2c_client *client)
+static int mxt_send_bootloader_cmd(struct mxt_data *data, bool unlock)
 {
+       int ret;
        u8 buf[2];
 
-       buf[0] = MXT_UNLOCK_CMD_LSB;
-       buf[1] = MXT_UNLOCK_CMD_MSB;
-
-       if (i2c_master_send(client, buf, 2) != 2) {
-               dev_err(&client->dev, "%s: i2c send failed\n", __func__);
-               return -EIO;
+       if (unlock) {
+               buf[0] = MXT_UNLOCK_CMD_LSB;
+               buf[1] = MXT_UNLOCK_CMD_MSB;
+       } else {
+               buf[0] = 0x01;
+               buf[1] = 0x01;
        }
 
-       return 0;
-}
-
-static int mxt_fw_write(struct i2c_client *client,
-                            const u8 *data, unsigned int frame_size)
-{
-       if (i2c_master_send(client, data, frame_size) != frame_size) {
-               dev_err(&client->dev, "%s: i2c send failed\n", __func__);
-               return -EIO;
-       }
+       ret = mxt_bootloader_write(data, buf, 2);
+       if (ret)
+               return ret;
 
        return 0;
 }
@@ -427,11 +572,6 @@ static int __mxt_read_reg(struct i2c_client *client,
        return ret;
 }
 
-static int mxt_read_reg(struct i2c_client *client, u16 reg, u8 *val)
-{
-       return __mxt_read_reg(client, reg, 1, val);
-}
-
 static int __mxt_write_reg(struct i2c_client *client, u16 reg, u16 len,
                           const void *val)
 {
@@ -479,12 +619,11 @@ mxt_get_object(struct mxt_data *data, u8 type)
                        return object;
        }
 
-       dev_err(&data->client->dev, "Invalid object type\n");
+       dev_warn(&data->client->dev, "Invalid object type T%u\n", type);
        return NULL;
 }
 
-static int mxt_read_message(struct mxt_data *data,
-                                struct mxt_message *message)
+static int mxt_read_message(struct mxt_data *data, u8 *message)
 {
        struct mxt_object *object;
        u16 reg;
@@ -495,7 +634,7 @@ static int mxt_read_message(struct mxt_data *data,
 
        reg = object->start_address;
        return __mxt_read_reg(data->client, reg,
-                       sizeof(struct mxt_message), message);
+                       data->T5_msg_size, message);
 }
 
 static int mxt_write_object(struct mxt_data *data,
@@ -505,374 +644,914 @@ static int mxt_write_object(struct mxt_data *data,
        u16 reg;
 
        object = mxt_get_object(data, type);
-       if (!object || offset >= object->size + 1)
+       if (!object || offset >= mxt_obj_size(object))
                return -EINVAL;
 
        reg = object->start_address;
        return mxt_write_reg(data->client, reg + offset, val);
 }
 
-static void mxt_input_button(struct mxt_data *data, struct mxt_message *message)
+static void mxt_input_button(struct mxt_data *data, u8 *message)
 {
        struct input_dev *input = data->input_dev;
+       const struct mxt_platform_data *pdata = data->pdata;
        bool button;
        int i;
 
        /* Active-low switch */
-       for (i = 0; i < MXT_NUM_GPIO; i++) {
-               if (data->pdata->key_map[i] == KEY_RESERVED)
+       for (i = 0; i < pdata->t19_num_keys; i++) {
+               if (pdata->t19_keymap[i] == KEY_RESERVED)
                        continue;
-               button = !(message->message[0] & MXT_GPIO0_MASK << i);
-               input_report_key(input, data->pdata->key_map[i], button);
+               button = !(message[1] & (1 << i));
+               input_report_key(input, pdata->t19_keymap[i], button);
        }
 }
 
-static void mxt_input_touchevent(struct mxt_data *data,
-                                     struct mxt_message *message, int id)
+static void mxt_input_sync(struct mxt_data *data)
+{
+       input_mt_report_pointer_emulation(data->input_dev,
+                                         data->pdata->t19_num_keys);
+       input_sync(data->input_dev);
+}
+
+static void mxt_input_touchevent(struct mxt_data *data, u8 *message)
 {
        struct device *dev = &data->client->dev;
-       u8 status = message->message[0];
        struct input_dev *input_dev = data->input_dev;
+       int id;
+       u8 status;
        int x;
        int y;
        int area;
-       int pressure;
+       int amplitude;
+
+       id = message[0] - data->T9_reportid_min;
+       status = message[1];
+       x = (message[2] << 4) | ((message[4] >> 4) & 0xf);
+       y = (message[3] << 4) | ((message[4] & 0xf));
 
-       x = (message->message[1] << 4) | ((message->message[3] >> 4) & 0xf);
-       y = (message->message[2] << 4) | ((message->message[3] & 0xf));
+       /* Handle 10/12 bit switching */
        if (data->max_x < 1024)
-               x = x >> 2;
+               x >>= 2;
        if (data->max_y < 1024)
-               y = y >> 2;
+               y >>= 2;
 
-       area = message->message[4];
-       pressure = message->message[5];
+       area = message[5];
+       amplitude = message[6];
 
        dev_dbg(dev,
                "[%u] %c%c%c%c%c%c%c%c x: %5u y: %5u area: %3u amp: %3u\n",
                id,
-               (status & MXT_DETECT) ? 'D' : '.',
-               (status & MXT_PRESS) ? 'P' : '.',
-               (status & MXT_RELEASE) ? 'R' : '.',
-               (status & MXT_MOVE) ? 'M' : '.',
-               (status & MXT_VECTOR) ? 'V' : '.',
-               (status & MXT_AMP) ? 'A' : '.',
-               (status & MXT_SUPPRESS) ? 'S' : '.',
-               (status & MXT_UNGRIP) ? 'U' : '.',
-               x, y, area, pressure);
+               (status & MXT_T9_DETECT) ? 'D' : '.',
+               (status & MXT_T9_PRESS) ? 'P' : '.',
+               (status & MXT_T9_RELEASE) ? 'R' : '.',
+               (status & MXT_T9_MOVE) ? 'M' : '.',
+               (status & MXT_T9_VECTOR) ? 'V' : '.',
+               (status & MXT_T9_AMP) ? 'A' : '.',
+               (status & MXT_T9_SUPPRESS) ? 'S' : '.',
+               (status & MXT_T9_UNGRIP) ? 'U' : '.',
+               x, y, area, amplitude);
 
        input_mt_slot(input_dev, id);
-       input_mt_report_slot_state(input_dev, MT_TOOL_FINGER,
-                                  status & MXT_DETECT);
 
-       if (status & MXT_DETECT) {
+       if (status & MXT_T9_DETECT) {
+               /*
+                * Multiple bits may be set if the host is slow to read
+                * the status messages, indicating all the events that
+                * have happened.
+                */
+               if (status & MXT_T9_RELEASE) {
+                       input_mt_report_slot_state(input_dev,
+                                                  MT_TOOL_FINGER, 0);
+                       mxt_input_sync(data);
+               }
+
+               /* Touch active */
+               input_mt_report_slot_state(input_dev, MT_TOOL_FINGER, 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, pressure);
+               input_report_abs(input_dev, ABS_MT_PRESSURE, amplitude);
                input_report_abs(input_dev, ABS_MT_TOUCH_MAJOR, area);
+       } else {
+               /* Touch no longer active, close out slot */
+               input_mt_report_slot_state(input_dev, MT_TOOL_FINGER, 0);
        }
 }
 
-static unsigned mxt_extract_T6_csum(const u8 *csum)
+static u16 mxt_extract_T6_csum(const u8 *csum)
 {
        return csum[0] | (csum[1] << 8) | (csum[2] << 16);
 }
 
-static bool mxt_is_T9_message(struct mxt_data *data, struct mxt_message *msg)
+static bool mxt_is_T9_message(struct mxt_data *data, u8 *msg)
 {
-       u8 id = msg->reportid;
+       u8 id = msg[0];
        return (id >= data->T9_reportid_min && id <= data->T9_reportid_max);
 }
 
-static irqreturn_t mxt_interrupt(int irq, void *dev_id)
+static irqreturn_t mxt_process_messages_until_invalid(struct mxt_data *data)
 {
-       struct mxt_data *data = dev_id;
-       struct mxt_message message;
-       const u8 *payload = &message.message[0];
+       u8 *message = &data->msg_buf[0];
+       const u8 *payload = &data->msg_buf[1];
        struct device *dev = &data->client->dev;
        u8 reportid;
        bool update_input = false;
+       u32 crc;
 
        do {
-               if (mxt_read_message(data, &message)) {
+               if (mxt_read_message(data, message)) {
                        dev_err(dev, "Failed to read message\n");
-                       goto end;
+                       return IRQ_NONE;
                }
 
-               reportid = message.reportid;
+               reportid = message[0];
 
                if (reportid == data->T6_reportid) {
                        u8 status = payload[0];
-                       unsigned csum = mxt_extract_T6_csum(&payload[1]);
+
+                       crc = mxt_extract_T6_csum(&payload[1]);
+                       if (crc != data->config_crc) {
+                               data->config_crc = crc;
+                               complete(&data->crc_completion);
+                       }
+
                        dev_dbg(dev, "Status: %02x Config Checksum: %06x\n",
-                               status, csum);
-               } else if (mxt_is_T9_message(data, &message)) {
-                       int id = reportid - data->T9_reportid_min;
-                       mxt_input_touchevent(data, &message, id);
+                               status, data->config_crc);
+
+                       if (status & MXT_T6_STATUS_RESET)
+                               complete(&data->reset_completion);
+               } else if (!data->input_dev) {
+                       /*
+                        * do not report events if input device
+                        * is not yet registered
+                        */
+                       mxt_dump_message(data, message);
+               } else if (mxt_is_T9_message(data, message)) {
+                       mxt_input_touchevent(data, message);
                        update_input = true;
-               } else if (message.reportid == data->T19_reportid) {
-                       mxt_input_button(data, &message);
+               } else if (reportid == data->T19_reportid) {
+                       mxt_input_button(data, message);
                        update_input = true;
                } else {
-                       mxt_dump_message(dev, &message);
+                       mxt_dump_message(data, message);
                }
-       } while (reportid != 0xff);
+       } while (reportid != MXT_RPTID_NOMSG);
 
-       if (update_input) {
-               input_mt_report_pointer_emulation(data->input_dev, false);
-               input_sync(data->input_dev);
-       }
+       if (update_input)
+               mxt_input_sync(data);
 
-end:
        return IRQ_HANDLED;
 }
 
-static int mxt_check_reg_init(struct mxt_data *data)
+static irqreturn_t mxt_interrupt(int irq, void *dev_id)
 {
-       const struct mxt_platform_data *pdata = data->pdata;
-       struct mxt_object *object;
-       struct device *dev = &data->client->dev;
-       int index = 0;
-       int i, size;
-       int ret;
+       struct mxt_data *data = dev_id;
 
-       if (!pdata->config) {
-               dev_dbg(dev, "No cfg data defined, skipping reg init\n");
-               return 0;
+       if (data->in_bootloader) {
+               /* bootloader state transition completion */
+               complete(&data->bl_completion);
+               return IRQ_HANDLED;
        }
 
-       for (i = 0; i < data->info.object_num; i++) {
-               object = data->object_table + i;
+       if (!data->object_table)
+               return IRQ_HANDLED;
 
-               if (!mxt_object_writable(object->type))
-                       continue;
+       return mxt_process_messages_until_invalid(data);
+}
 
-               size = (object->size + 1) * (object->instances + 1);
-               if (index + size > pdata->config_length) {
-                       dev_err(dev, "Not enough config data!\n");
-                       return -EINVAL;
-               }
+static int mxt_t6_command(struct mxt_data *data, u16 cmd_offset,
+                         u8 value, bool wait)
+{
+       u16 reg;
+       u8 command_register;
+       int timeout_counter = 0;
+       int ret;
+
+       reg = data->T6_address + cmd_offset;
+
+       ret = mxt_write_reg(data->client, reg, value);
+       if (ret)
+               return ret;
+
+       if (!wait)
+               return 0;
 
-               ret = __mxt_write_reg(data->client, object->start_address,
-                               size, &pdata->config[index]);
+       do {
+               msleep(20);
+               ret = __mxt_read_reg(data->client, reg, 1, &command_register);
                if (ret)
                        return ret;
-               index += size;
+       } while (command_register != 0 && timeout_counter++ <= 100);
+
+       if (timeout_counter > 100) {
+               dev_err(&data->client->dev, "Command failed!\n");
+               return -EIO;
        }
 
        return 0;
 }
 
-static int mxt_make_highchg(struct mxt_data *data)
+static int mxt_soft_reset(struct mxt_data *data)
 {
        struct device *dev = &data->client->dev;
-       struct mxt_message message;
-       int count = 10;
-       int error;
+       int ret = 0;
 
-       /* Read dummy message to make high CHG pin */
-       do {
-               error = mxt_read_message(data, &message);
-               if (error)
-                       return error;
-       } while (message.reportid != 0xff && --count);
+       dev_info(dev, "Resetting chip\n");
 
-       if (!count) {
-               dev_err(dev, "CHG pin isn't cleared\n");
-               return -EBUSY;
-       }
+       reinit_completion(&data->reset_completion);
+
+       ret = mxt_t6_command(data, MXT_COMMAND_RESET, MXT_RESET_VALUE, false);
+       if (ret)
+               return ret;
+
+       ret = mxt_wait_for_completion(data, &data->reset_completion,
+                                     MXT_RESET_TIMEOUT);
+       if (ret)
+               return ret;
 
        return 0;
 }
 
-static void mxt_handle_pdata(struct mxt_data *data)
+static void mxt_update_crc(struct mxt_data *data, u8 cmd, u8 value)
 {
-       const struct mxt_platform_data *pdata = data->pdata;
-       u8 voltage;
-
-       /* Set touchscreen lines */
-       mxt_write_object(data, MXT_TOUCH_MULTI_T9, MXT_TOUCH_XSIZE,
-                       pdata->x_line);
-       mxt_write_object(data, MXT_TOUCH_MULTI_T9, MXT_TOUCH_YSIZE,
-                       pdata->y_line);
-
-       /* Set touchscreen orient */
-       mxt_write_object(data, MXT_TOUCH_MULTI_T9, MXT_TOUCH_ORIENT,
-                       pdata->orient);
-
-       /* Set touchscreen burst length */
-       mxt_write_object(data, MXT_TOUCH_MULTI_T9,
-                       MXT_TOUCH_BLEN, pdata->blen);
-
-       /* Set touchscreen threshold */
-       mxt_write_object(data, MXT_TOUCH_MULTI_T9,
-                       MXT_TOUCH_TCHTHR, pdata->threshold);
-
-       /* Set touchscreen resolution */
-       mxt_write_object(data, MXT_TOUCH_MULTI_T9,
-                       MXT_TOUCH_XRANGE_LSB, (pdata->x_size - 1) & 0xff);
-       mxt_write_object(data, MXT_TOUCH_MULTI_T9,
-                       MXT_TOUCH_XRANGE_MSB, (pdata->x_size - 1) >> 8);
-       mxt_write_object(data, MXT_TOUCH_MULTI_T9,
-                       MXT_TOUCH_YRANGE_LSB, (pdata->y_size - 1) & 0xff);
-       mxt_write_object(data, MXT_TOUCH_MULTI_T9,
-                       MXT_TOUCH_YRANGE_MSB, (pdata->y_size - 1) >> 8);
-
-       /* Set touchscreen voltage */
-       if (pdata->voltage) {
-               if (pdata->voltage < MXT_VOLTAGE_DEFAULT) {
-                       voltage = (MXT_VOLTAGE_DEFAULT - pdata->voltage) /
-                               MXT_VOLTAGE_STEP;
-                       voltage = 0xff - voltage + 1;
-               } else
-                       voltage = (pdata->voltage - MXT_VOLTAGE_DEFAULT) /
-                               MXT_VOLTAGE_STEP;
-
-               mxt_write_object(data, MXT_SPT_CTECONFIG_T28,
-                               MXT_CTE_VOLTAGE, voltage);
-       }
+       /*
+        * On failure, CRC is set to 0 and config will always be
+        * downloaded.
+        */
+       data->config_crc = 0;
+       reinit_completion(&data->crc_completion);
+
+       mxt_t6_command(data, cmd, value, true);
+
+       /*
+        * Wait for crc message. On failure, CRC is set to 0 and config will
+        * always be downloaded.
+        */
+       mxt_wait_for_completion(data, &data->crc_completion, MXT_CRC_TIMEOUT);
 }
 
-static int mxt_get_info(struct mxt_data *data)
+static void mxt_calc_crc24(u32 *crc, u8 firstbyte, u8 secondbyte)
 {
-       struct i2c_client *client = data->client;
-       struct mxt_info *info = &data->info;
-       int error;
+       static const unsigned int crcpoly = 0x80001B;
+       u32 result;
+       u32 data_word;
 
-       /* Read 7-byte info block starting at address 0 */
-       error = __mxt_read_reg(client, MXT_INFO, sizeof(*info), info);
-       if (error)
-               return error;
+       data_word = (secondbyte << 8) | firstbyte;
+       result = ((*crc << 1) ^ data_word);
 
-       return 0;
+       if (result & 0x1000000)
+               result ^= crcpoly;
+
+       *crc = result;
 }
 
-static int mxt_get_object_table(struct mxt_data *data)
+static u32 mxt_calculate_crc(u8 *base, off_t start_off, off_t end_off)
 {
-       struct i2c_client *client = data->client;
-       size_t table_size;
-       int error;
-       int i;
-       u8 reportid;
-
-       table_size = data->info.object_num * sizeof(struct mxt_object);
-       error = __mxt_read_reg(client, MXT_OBJECT_START, table_size,
-                       data->object_table);
-       if (error)
-               return error;
-
-       /* Valid Report IDs start counting from 1 */
-       reportid = 1;
-       for (i = 0; i < data->info.object_num; i++) {
-               struct mxt_object *object = data->object_table + i;
-               u8 min_id, max_id;
+       u32 crc = 0;
+       u8 *ptr = base + start_off;
+       u8 *last_val = base + end_off - 1;
 
-               le16_to_cpus(&object->start_address);
+       if (end_off < start_off)
+               return -EINVAL;
 
-               if (object->num_report_ids) {
-                       min_id = reportid;
-                       reportid += object->num_report_ids *
-                                       (object->instances + 1);
-                       max_id = reportid - 1;
-               } else {
-                       min_id = 0;
-                       max_id = 0;
-               }
+       while (ptr < last_val) {
+               mxt_calc_crc24(&crc, *ptr, *(ptr + 1));
+               ptr += 2;
+       }
 
-               dev_dbg(&data->client->dev,
-                       "Type %2d Start %3d Size %3d Instances %2d ReportIDs %3u : %3u\n",
-                       object->type, object->start_address, object->size + 1,
-                       object->instances + 1, min_id, max_id);
+       /* if len is odd, fill the last byte with 0 */
+       if (ptr == last_val)
+               mxt_calc_crc24(&crc, *ptr, 0);
 
-               switch (object->type) {
-               case MXT_GEN_COMMAND_T6:
-                       data->T6_reportid = min_id;
-                       break;
-               case MXT_TOUCH_MULTI_T9:
-                       data->T9_reportid_min = min_id;
-                       data->T9_reportid_max = max_id;
-                       break;
-               case MXT_SPT_GPIOPWM_T19:
-                       data->T19_reportid = min_id;
-                       break;
-               }
-       }
+       /* Mask to 24-bit */
+       crc &= 0x00FFFFFF;
 
-       return 0;
+       return crc;
 }
 
-static void mxt_free_object_table(struct mxt_data *data)
-{
-       kfree(data->object_table);
-       data->object_table = NULL;
-       data->T6_reportid = 0;
-       data->T9_reportid_min = 0;
-       data->T9_reportid_max = 0;
-       data->T19_reportid = 0;
+/*
+ * mxt_update_cfg - download configuration to chip
+ *
+ * Atmel Raw Config File Format
+ *
+ * The first four lines of the raw config file contain:
+ *  1) Version
+ *  2) Chip ID Information (first 7 bytes of device memory)
+ *  3) Chip Information Block 24-bit CRC Checksum
+ *  4) Chip Configuration 24-bit CRC Checksum
+ *
+ * The rest of the file consists of one line per object instance:
+ *   <TYPE> <INSTANCE> <SIZE> <CONTENTS>
+ *
+ *   <TYPE> - 2-byte object type as hex
+ *   <INSTANCE> - 2-byte object instance number as hex
+ *   <SIZE> - 2-byte object size as hex
+ *   <CONTENTS> - array of <SIZE> 1-byte hex values
+ */
+static int mxt_update_cfg(struct mxt_data *data, const struct firmware *cfg)
+{
+       struct device *dev = &data->client->dev;
+       struct mxt_info cfg_info;
+       struct mxt_object *object;
+       int ret;
+       int offset;
+       int data_pos;
+       int byte_offset;
+       int i;
+       int cfg_start_ofs;
+       u32 info_crc, config_crc, calculated_crc;
+       u8 *config_mem;
+       size_t config_mem_size;
+       unsigned int type, instance, size;
+       u8 val;
+       u16 reg;
+
+       mxt_update_crc(data, MXT_COMMAND_REPORTALL, 1);
+
+       if (strncmp(cfg->data, MXT_CFG_MAGIC, strlen(MXT_CFG_MAGIC))) {
+               dev_err(dev, "Unrecognised config file\n");
+               ret = -EINVAL;
+               goto release;
+       }
+
+       data_pos = strlen(MXT_CFG_MAGIC);
+
+       /* Load information block and check */
+       for (i = 0; i < sizeof(struct mxt_info); i++) {
+               ret = sscanf(cfg->data + data_pos, "%hhx%n",
+                            (unsigned char *)&cfg_info + i,
+                            &offset);
+               if (ret != 1) {
+                       dev_err(dev, "Bad format\n");
+                       ret = -EINVAL;
+                       goto release;
+               }
+
+               data_pos += offset;
+       }
+
+       if (cfg_info.family_id != data->info.family_id) {
+               dev_err(dev, "Family ID mismatch!\n");
+               ret = -EINVAL;
+               goto release;
+       }
+
+       if (cfg_info.variant_id != data->info.variant_id) {
+               dev_err(dev, "Variant ID mismatch!\n");
+               ret = -EINVAL;
+               goto release;
+       }
+
+       /* Read CRCs */
+       ret = sscanf(cfg->data + data_pos, "%x%n", &info_crc, &offset);
+       if (ret != 1) {
+               dev_err(dev, "Bad format: failed to parse Info CRC\n");
+               ret = -EINVAL;
+               goto release;
+       }
+       data_pos += offset;
+
+       ret = sscanf(cfg->data + data_pos, "%x%n", &config_crc, &offset);
+       if (ret != 1) {
+               dev_err(dev, "Bad format: failed to parse Config CRC\n");
+               ret = -EINVAL;
+               goto release;
+       }
+       data_pos += offset;
+
+       /*
+        * The Info Block CRC is calculated over mxt_info and the object
+        * table. If it does not match then we are trying to load the
+        * configuration from a different chip or firmware version, so
+        * the configuration CRC is invalid anyway.
+        */
+       if (info_crc == data->info_crc) {
+               if (config_crc == 0 || data->config_crc == 0) {
+                       dev_info(dev, "CRC zero, attempting to apply config\n");
+               } else if (config_crc == data->config_crc) {
+                       dev_dbg(dev, "Config CRC 0x%06X: OK\n",
+                                data->config_crc);
+                       ret = 0;
+                       goto release;
+               } else {
+                       dev_info(dev, "Config CRC 0x%06X: does not match file 0x%06X\n",
+                                data->config_crc, config_crc);
+               }
+       } else {
+               dev_warn(dev,
+                        "Warning: Info CRC error - device=0x%06X file=0x%06X\n",
+                        data->info_crc, info_crc);
+       }
+
+       /* Malloc memory to store configuration */
+       cfg_start_ofs = MXT_OBJECT_START +
+                       data->info.object_num * sizeof(struct mxt_object) +
+                       MXT_INFO_CHECKSUM_SIZE;
+       config_mem_size = data->mem_size - cfg_start_ofs;
+       config_mem = kzalloc(config_mem_size, GFP_KERNEL);
+       if (!config_mem) {
+               dev_err(dev, "Failed to allocate memory\n");
+               ret = -ENOMEM;
+               goto release;
+       }
+
+       while (data_pos < cfg->size) {
+               /* Read type, instance, length */
+               ret = sscanf(cfg->data + data_pos, "%x %x %x%n",
+                            &type, &instance, &size, &offset);
+               if (ret == 0) {
+                       /* EOF */
+                       break;
+               } else if (ret != 3) {
+                       dev_err(dev, "Bad format: failed to parse object\n");
+                       ret = -EINVAL;
+                       goto release_mem;
+               }
+               data_pos += offset;
+
+               object = mxt_get_object(data, type);
+               if (!object) {
+                       /* Skip object */
+                       for (i = 0; i < size; i++) {
+                               ret = sscanf(cfg->data + data_pos, "%hhx%n",
+                                            &val,
+                                            &offset);
+                               data_pos += offset;
+                       }
+                       continue;
+               }
+
+               if (size > mxt_obj_size(object)) {
+                       /*
+                        * Either we are in fallback mode due to wrong
+                        * config or config from a later fw version,
+                        * or the file is corrupt or hand-edited.
+                        */
+                       dev_warn(dev, "Discarding %zu byte(s) in T%u\n",
+                                size - mxt_obj_size(object), type);
+               } else if (mxt_obj_size(object) > size) {
+                       /*
+                        * If firmware is upgraded, new bytes may be added to
+                        * end of objects. It is generally forward compatible
+                        * to zero these bytes - previous behaviour will be
+                        * retained. However this does invalidate the CRC and
+                        * will force fallback mode until the configuration is
+                        * updated. We warn here but do nothing else - the
+                        * malloc has zeroed the entire configuration.
+                        */
+                       dev_warn(dev, "Zeroing %zu byte(s) in T%d\n",
+                                mxt_obj_size(object) - size, type);
+               }
+
+               if (instance >= mxt_obj_instances(object)) {
+                       dev_err(dev, "Object instances exceeded!\n");
+                       ret = -EINVAL;
+                       goto release_mem;
+               }
+
+               reg = object->start_address + mxt_obj_size(object) * instance;
+
+               for (i = 0; i < size; i++) {
+                       ret = sscanf(cfg->data + data_pos, "%hhx%n",
+                                    &val,
+                                    &offset);
+                       if (ret != 1) {
+                               dev_err(dev, "Bad format in T%d\n", type);
+                               ret = -EINVAL;
+                               goto release_mem;
+                       }
+                       data_pos += offset;
+
+                       if (i > mxt_obj_size(object))
+                               continue;
+
+                       byte_offset = reg + i - cfg_start_ofs;
+
+                       if ((byte_offset >= 0)
+                           && (byte_offset <= config_mem_size)) {
+                               *(config_mem + byte_offset) = val;
+                       } else {
+                               dev_err(dev, "Bad object: reg:%d, T%d, ofs=%d\n",
+                                       reg, object->type, byte_offset);
+                               ret = -EINVAL;
+                               goto release_mem;
+                       }
+               }
+       }
+
+       /* Calculate crc of the received configs (not the raw config file) */
+       if (data->T7_address < cfg_start_ofs) {
+               dev_err(dev, "Bad T7 address, T7addr = %x, config offset %x\n",
+                       data->T7_address, cfg_start_ofs);
+               ret = 0;
+               goto release_mem;
+       }
+
+       calculated_crc = mxt_calculate_crc(config_mem,
+                                          data->T7_address - cfg_start_ofs,
+                                          config_mem_size);
+
+       if (config_crc > 0 && (config_crc != calculated_crc))
+               dev_warn(dev, "Config CRC error, calculated=%06X, file=%06X\n",
+                        calculated_crc, config_crc);
+
+       /* Write configuration as blocks */
+       byte_offset = 0;
+       while (byte_offset < config_mem_size) {
+               size = config_mem_size - byte_offset;
+
+               if (size > MXT_MAX_BLOCK_WRITE)
+                       size = MXT_MAX_BLOCK_WRITE;
+
+               ret = __mxt_write_reg(data->client,
+                                     cfg_start_ofs + byte_offset,
+                                     size, config_mem + byte_offset);
+               if (ret != 0) {
+                       dev_err(dev, "Config write error, ret=%d\n", ret);
+                       goto release_mem;
+               }
+
+               byte_offset += size;
+       }
+
+       mxt_update_crc(data, MXT_COMMAND_BACKUPNV, MXT_BACKUP_VALUE);
+
+       ret = mxt_soft_reset(data);
+       if (ret)
+               goto release_mem;
+
+       dev_info(dev, "Config successfully updated\n");
+
+release_mem:
+       kfree(config_mem);
+release:
+       release_firmware(cfg);
+       return ret;
 }
 
-static int mxt_initialize(struct mxt_data *data)
+static int mxt_make_highchg(struct mxt_data *data)
+{
+       struct device *dev = &data->client->dev;
+       int count = 10;
+       int error;
+
+       /* Read dummy message to make high CHG pin */
+       do {
+               error = mxt_read_message(data, data->msg_buf);
+               if (error)
+                       return error;
+       } while (data->msg_buf[0] != MXT_RPTID_NOMSG && --count);
+
+       if (!count) {
+               dev_err(dev, "CHG pin isn't cleared\n");
+               return -EBUSY;
+       }
+
+       return 0;
+}
+
+static int mxt_acquire_irq(struct mxt_data *data)
+{
+       int error;
+
+       enable_irq(data->irq);
+
+       error = mxt_make_highchg(data);
+       if (error)
+               return error;
+
+       return 0;
+}
+
+static int mxt_get_info(struct mxt_data *data)
 {
        struct i2c_client *client = data->client;
        struct mxt_info *info = &data->info;
        int error;
-       u8 val;
 
-       error = mxt_get_info(data);
+       /* Read 7-byte info block starting at address 0 */
+       error = __mxt_read_reg(client, MXT_INFO, sizeof(*info), info);
        if (error)
                return error;
 
-       data->object_table = kcalloc(info->object_num,
-                                    sizeof(struct mxt_object),
-                                    GFP_KERNEL);
-       if (!data->object_table) {
-               dev_err(&client->dev, "Failed to allocate memory\n");
+       return 0;
+}
+
+static void mxt_free_object_table(struct mxt_data *data)
+{
+       input_unregister_device(data->input_dev);
+       data->input_dev = NULL;
+
+       kfree(data->object_table);
+       data->object_table = NULL;
+       kfree(data->msg_buf);
+       data->msg_buf = NULL;
+       data->T5_msg_size = 0;
+       data->T6_reportid = 0;
+       data->T7_address = 0;
+       data->T9_reportid_min = 0;
+       data->T9_reportid_max = 0;
+       data->T19_reportid = 0;
+}
+
+static int mxt_get_object_table(struct mxt_data *data)
+{
+       struct i2c_client *client = data->client;
+       size_t table_size;
+       struct mxt_object *object_table;
+       int error;
+       int i;
+       u8 reportid;
+       u16 end_address;
+
+       table_size = data->info.object_num * sizeof(struct mxt_object);
+       object_table = kzalloc(table_size, GFP_KERNEL);
+       if (!object_table) {
+               dev_err(&data->client->dev, "Failed to allocate memory\n");
                return -ENOMEM;
        }
 
-       /* Get object table information */
-       error = mxt_get_object_table(data);
+       error = __mxt_read_reg(client, MXT_OBJECT_START, table_size,
+                       object_table);
+       if (error) {
+               kfree(object_table);
+               return error;
+       }
+
+       /* Valid Report IDs start counting from 1 */
+       reportid = 1;
+       data->mem_size = 0;
+       for (i = 0; i < data->info.object_num; i++) {
+               struct mxt_object *object = object_table + i;
+               u8 min_id, max_id;
+
+               le16_to_cpus(&object->start_address);
+
+               if (object->num_report_ids) {
+                       min_id = reportid;
+                       reportid += object->num_report_ids *
+                                       mxt_obj_instances(object);
+                       max_id = reportid - 1;
+               } else {
+                       min_id = 0;
+                       max_id = 0;
+               }
+
+               dev_dbg(&data->client->dev,
+                       "T%u Start:%u Size:%zu Instances:%zu Report IDs:%u-%u\n",
+                       object->type, object->start_address,
+                       mxt_obj_size(object), mxt_obj_instances(object),
+                       min_id, max_id);
+
+               switch (object->type) {
+               case MXT_GEN_MESSAGE_T5:
+                       /* CRC not enabled, therefore don't read last byte */
+                       data->T5_msg_size = mxt_obj_size(object) - 1;
+               case MXT_GEN_COMMAND_T6:
+                       data->T6_reportid = min_id;
+                       data->T6_address = object->start_address;
+                       break;
+               case MXT_GEN_POWER_T7:
+                       data->T7_address = object->start_address;
+                       break;
+               case MXT_TOUCH_MULTI_T9:
+                       data->T9_reportid_min = min_id;
+                       data->T9_reportid_max = max_id;
+                       break;
+               case MXT_SPT_GPIOPWM_T19:
+                       data->T19_reportid = min_id;
+                       break;
+               }
+
+               end_address = object->start_address
+                       + mxt_obj_size(object) * mxt_obj_instances(object) - 1;
+
+               if (end_address >= data->mem_size)
+                       data->mem_size = end_address + 1;
+       }
+
+       data->msg_buf = kzalloc(data->T5_msg_size, GFP_KERNEL);
+       if (!data->msg_buf) {
+               dev_err(&client->dev, "Failed to allocate message buffer\n");
+               error = -ENOMEM;
+               goto free_object_table;
+       }
+
+       data->object_table = object_table;
+
+       return 0;
+
+free_object_table:
+       mxt_free_object_table(data);
+       return error;
+}
+
+static int mxt_read_t9_resolution(struct mxt_data *data)
+{
+       struct i2c_client *client = data->client;
+       int error;
+       struct t9_range range;
+       unsigned char orient;
+       struct mxt_object *object;
+
+       object = mxt_get_object(data, MXT_TOUCH_MULTI_T9);
+       if (!object)
+               return -EINVAL;
+
+       error = __mxt_read_reg(client,
+                              object->start_address + MXT_T9_RANGE,
+                              sizeof(range), &range);
        if (error)
-               goto err_free_object_table;
+               return error;
 
-       /* Check register init values */
-       error = mxt_check_reg_init(data);
+       le16_to_cpus(&range.x);
+       le16_to_cpus(&range.y);
+
+       error =  __mxt_read_reg(client,
+                               object->start_address + MXT_T9_ORIENT,
+                               1, &orient);
        if (error)
-               goto err_free_object_table;
+               return error;
+
+       /* Handle default values */
+       if (range.x == 0)
+               range.x = 1023;
+
+       if (range.y == 0)
+               range.y = 1023;
 
-       mxt_handle_pdata(data);
+       if (orient & MXT_T9_ORIENT_SWITCH) {
+               data->max_x = range.y;
+               data->max_y = range.x;
+       } else {
+               data->max_x = range.x;
+               data->max_y = range.y;
+       }
 
-       /* Backup to memory */
-       mxt_write_object(data, MXT_GEN_COMMAND_T6,
-                       MXT_COMMAND_BACKUPNV,
-                       MXT_BACKUP_VALUE);
-       msleep(MXT_BACKUP_TIME);
+       dev_dbg(&client->dev,
+               "Touchscreen size X%uY%u\n", data->max_x, data->max_y);
 
-       /* Soft reset */
-       mxt_write_object(data, MXT_GEN_COMMAND_T6,
-                       MXT_COMMAND_RESET, 1);
-       msleep(MXT_RESET_TIME);
+       return 0;
+}
 
-       /* Update matrix size at info struct */
-       error = mxt_read_reg(client, MXT_MATRIX_X_SIZE, &val);
+static int mxt_input_open(struct input_dev *dev);
+static void mxt_input_close(struct input_dev *dev);
+
+static int mxt_initialize_t9_input_device(struct mxt_data *data)
+{
+       struct device *dev = &data->client->dev;
+       const struct mxt_platform_data *pdata = data->pdata;
+       struct input_dev *input_dev;
+       int error;
+       unsigned int num_mt_slots;
+       unsigned int mt_flags = 0;
+       int i;
+
+       error = mxt_read_t9_resolution(data);
        if (error)
-               goto err_free_object_table;
-       info->matrix_xsize = val;
+               dev_warn(dev, "Failed to initialize T9 resolution\n");
+
+       input_dev = input_allocate_device();
+       if (!input_dev) {
+               dev_err(dev, "Failed to allocate memory\n");
+               return -ENOMEM;
+       }
+
+       input_dev->name = "Atmel maXTouch Touchscreen";
+       input_dev->phys = data->phys;
+       input_dev->id.bustype = BUS_I2C;
+       input_dev->dev.parent = dev;
+       input_dev->open = mxt_input_open;
+       input_dev->close = mxt_input_close;
+
+       __set_bit(EV_ABS, input_dev->evbit);
+       __set_bit(EV_KEY, input_dev->evbit);
+       __set_bit(BTN_TOUCH, input_dev->keybit);
+
+       if (pdata->t19_num_keys) {
+               __set_bit(INPUT_PROP_BUTTONPAD, input_dev->propbit);
+
+               for (i = 0; i < pdata->t19_num_keys; i++)
+                       if (pdata->t19_keymap[i] != KEY_RESERVED)
+                               input_set_capability(input_dev, EV_KEY,
+                                                    pdata->t19_keymap[i]);
 
-       error = mxt_read_reg(client, MXT_MATRIX_Y_SIZE, &val);
+               mt_flags |= INPUT_MT_POINTER;
+
+               input_abs_set_res(input_dev, ABS_X, MXT_PIXELS_PER_MM);
+               input_abs_set_res(input_dev, ABS_Y, MXT_PIXELS_PER_MM);
+               input_abs_set_res(input_dev, ABS_MT_POSITION_X,
+                                 MXT_PIXELS_PER_MM);
+               input_abs_set_res(input_dev, ABS_MT_POSITION_Y,
+                                 MXT_PIXELS_PER_MM);
+
+               input_dev->name = "Atmel maXTouch Touchpad";
+       }
+
+       /* For single touch */
+       input_set_abs_params(input_dev, ABS_X,
+                            0, data->max_x, 0, 0);
+       input_set_abs_params(input_dev, ABS_Y,
+                            0, data->max_y, 0, 0);
+       input_set_abs_params(input_dev, ABS_PRESSURE,
+                            0, 255, 0, 0);
+
+       /* For multi touch */
+       num_mt_slots = data->T9_reportid_max - data->T9_reportid_min + 1;
+       error = input_mt_init_slots(input_dev, num_mt_slots, mt_flags);
+       if (error) {
+               dev_err(dev, "Error %d initialising slots\n", error);
+               goto err_free_mem;
+       }
+
+       input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR,
+                            0, MXT_MAX_AREA, 0, 0);
+       input_set_abs_params(input_dev, ABS_MT_POSITION_X,
+                            0, data->max_x, 0, 0);
+       input_set_abs_params(input_dev, ABS_MT_POSITION_Y,
+                            0, data->max_y, 0, 0);
+       input_set_abs_params(input_dev, ABS_MT_PRESSURE,
+                            0, 255, 0, 0);
+
+       input_set_drvdata(input_dev, data);
+
+       error = input_register_device(input_dev);
+       if (error) {
+               dev_err(dev, "Error %d registering input device\n", error);
+               goto err_free_mem;
+       }
+
+       data->input_dev = input_dev;
+
+       return 0;
+
+err_free_mem:
+       input_free_device(input_dev);
+       return error;
+}
+
+static int mxt_configure_objects(struct mxt_data *data,
+                                const struct firmware *cfg);
+
+static void mxt_config_cb(const struct firmware *cfg, void *ctx)
+{
+       mxt_configure_objects(ctx, cfg);
+}
+
+static int mxt_initialize(struct mxt_data *data)
+{
+       struct i2c_client *client = data->client;
+       int error;
+       bool alt_bootloader_addr = false;
+       bool retry = false;
+
+retry_info:
+       error = mxt_get_info(data);
+       if (error) {
+retry_bootloader:
+               error = mxt_probe_bootloader(data, alt_bootloader_addr);
+               if (error) {
+                       if (alt_bootloader_addr) {
+                               /* Chip is not in appmode or bootloader mode */
+                               return error;
+                       }
+
+                       dev_info(&client->dev, "Trying alternate bootloader address\n");
+                       alt_bootloader_addr = true;
+                       goto retry_bootloader;
+               } else {
+                       if (retry) {
+                               dev_err(&client->dev, "Could not recover from bootloader mode\n");
+                               /*
+                                * We can reflash from this state, so do not
+                                * abort init
+                                */
+                               data->in_bootloader = true;
+                               return 0;
+                       }
+
+                       /* Attempt to exit bootloader into app mode */
+                       mxt_send_bootloader_cmd(data, false);
+                       msleep(MXT_FW_RESET_TIME);
+                       retry = true;
+                       goto retry_info;
+               }
+       }
+
+       /* Get object table information */
+       error = mxt_get_object_table(data);
+       if (error) {
+               dev_err(&client->dev, "Error %d reading object table\n", error);
+               return error;
+       }
+
+       mxt_acquire_irq(data);
        if (error)
                goto err_free_object_table;
-       info->matrix_ysize = val;
-
-       dev_info(&client->dev,
-                       "Family ID: %u Variant ID: %u Major.Minor.Build: %u.%u.%02X\n",
-                       info->family_id, info->variant_id, info->version >> 4,
-                       info->version & 0xf, info->build);
 
-       dev_info(&client->dev,
-                       "Matrix X Size: %u Matrix Y Size: %u Object Num: %u\n",
-                       info->matrix_xsize, info->matrix_ysize,
-                       info->object_num);
+       request_firmware_nowait(THIS_MODULE, true, MXT_CFG_NAME,
+                               &data->client->dev, GFP_KERNEL, data,
+                               mxt_config_cb);
 
        return 0;
 
@@ -881,18 +1560,29 @@ err_free_object_table:
        return error;
 }
 
-static void mxt_calc_resolution(struct mxt_data *data)
+static int mxt_configure_objects(struct mxt_data *data,
+                                const struct firmware *cfg)
 {
-       unsigned int max_x = data->pdata->x_size - 1;
-       unsigned int max_y = data->pdata->y_size - 1;
+       struct device *dev = &data->client->dev;
+       struct mxt_info *info = &data->info;
+       int error;
 
-       if (data->pdata->orient & MXT_XY_SWITCH) {
-               data->max_x = max_y;
-               data->max_y = max_x;
-       } else {
-               data->max_x = max_x;
-               data->max_y = max_y;
+       if (cfg) {
+               error = mxt_update_cfg(data, cfg);
+               if (error)
+                       dev_warn(dev, "Error %d updating config\n", error);
        }
+
+       error = mxt_initialize_t9_input_device(data);
+       if (error)
+               return error;
+
+       dev_info(dev,
+                "Family: %u Variant: %u Firmware V%u.%u.%02X Objects: %u\n",
+                info->family_id, info->variant_id, info->version >> 4,
+                info->version & 0xf, info->build, info->object_num);
+
+       return 0;
 }
 
 /* Firmware Version is returned as Major.Minor.Build */
@@ -921,11 +1611,11 @@ static ssize_t mxt_show_instance(char *buf, int count,
 {
        int i;
 
-       if (object->instances > 0)
+       if (mxt_obj_instances(object) > 1)
                count += scnprintf(buf + count, PAGE_SIZE - count,
                                   "Instance %u\n", instance);
 
-       for (i = 0; i < object->size + 1; i++)
+       for (i = 0; i < mxt_obj_size(object); i++)
                count += scnprintf(buf + count, PAGE_SIZE - count,
                                "\t[%2u]: %02x (%d)\n", i, val[i], val[i]);
        count += scnprintf(buf + count, PAGE_SIZE - count, "\n");
@@ -958,8 +1648,8 @@ static ssize_t mxt_object_show(struct device *dev,
                count += scnprintf(buf + count, PAGE_SIZE - count,
                                "T%u:\n", object->type);
 
-               for (j = 0; j < object->instances + 1; j++) {
-                       u16 size = object->size + 1;
+               for (j = 0; j < mxt_obj_instances(object); j++) {
+                       u16 size = mxt_obj_size(object);
                        u16 addr = object->start_address + j * size;
 
                        error = __mxt_read_reg(data->client, addr, size, obuf);
@@ -975,13 +1665,38 @@ done:
        return error ?: count;
 }
 
+static int mxt_check_firmware_format(struct device *dev,
+                                    const struct firmware *fw)
+{
+       unsigned int pos = 0;
+       char c;
+
+       while (pos < fw->size) {
+               c = *(fw->data + pos);
+
+               if (c < '0' || (c > '9' && c < 'A') || c > 'F')
+                       return 0;
+
+               pos++;
+       }
+
+       /*
+        * To convert file try:
+        * xxd -r -p mXTXXX__APP_VX-X-XX.enc > maxtouch.fw
+        */
+       dev_err(dev, "Aborting: firmware file must be in binary format\n");
+
+       return -EINVAL;
+}
+
 static int mxt_load_fw(struct device *dev, const char *fn)
 {
        struct mxt_data *data = dev_get_drvdata(dev);
-       struct i2c_client *client = data->client;
        const struct firmware *fw = NULL;
        unsigned int frame_size;
        unsigned int pos = 0;
+       unsigned int retry = 0;
+       unsigned int frame = 0;
        int ret;
 
        ret = request_firmware(&fw, fn, dev);
@@ -990,59 +1705,106 @@ static int mxt_load_fw(struct device *dev, const char *fn)
                return ret;
        }
 
-       /* Change to the bootloader mode */
-       mxt_write_object(data, MXT_GEN_COMMAND_T6,
-                       MXT_COMMAND_RESET, MXT_BOOT_VALUE);
-       msleep(MXT_RESET_TIME);
+       /* Check for incorrect enc file */
+       ret = mxt_check_firmware_format(dev, fw);
+       if (ret)
+               goto release_firmware;
 
-       /* Change to slave address of bootloader */
-       if (client->addr == MXT_APP_LOW)
-               client->addr = MXT_BOOT_LOW;
-       else
-               client->addr = MXT_BOOT_HIGH;
+       if (!data->in_bootloader) {
+               /* Change to the bootloader mode */
+               data->in_bootloader = true;
 
-       ret = mxt_check_bootloader(client, MXT_WAITING_BOOTLOAD_CMD);
-       if (ret)
-               goto out;
+               ret = mxt_t6_command(data, MXT_COMMAND_RESET,
+                                    MXT_BOOT_VALUE, false);
+               if (ret)
+                       goto release_firmware;
+
+               msleep(MXT_RESET_TIME);
+
+               /* Do not need to scan since we know family ID */
+               ret = mxt_lookup_bootloader_address(data, 0);
+               if (ret)
+                       goto release_firmware;
+       } else {
+               enable_irq(data->irq);
+       }
+
+       mxt_free_object_table(data);
+       reinit_completion(&data->bl_completion);
+
+       ret = mxt_check_bootloader(data, MXT_WAITING_BOOTLOAD_CMD, false);
+       if (ret) {
+               /* Bootloader may still be unlocked from previous attempt */
+               ret = mxt_check_bootloader(data, MXT_WAITING_FRAME_DATA, false);
+               if (ret)
+                       goto disable_irq;
+       } else {
+               dev_info(dev, "Unlocking bootloader\n");
 
-       /* Unlock bootloader */
-       mxt_unlock_bootloader(client);
+               /* Unlock bootloader */
+               ret = mxt_send_bootloader_cmd(data, true);
+               if (ret)
+                       goto disable_irq;
+       }
 
        while (pos < fw->size) {
-               ret = mxt_check_bootloader(client,
-                                               MXT_WAITING_FRAME_DATA);
+               ret = mxt_check_bootloader(data, MXT_WAITING_FRAME_DATA, true);
                if (ret)
-                       goto out;
+                       goto disable_irq;
 
                frame_size = ((*(fw->data + pos) << 8) | *(fw->data + pos + 1));
 
-               /* We should add 2 at frame size as the the firmware data is not
-                * included the CRC bytes.
-                */
+               /* Take account of CRC bytes */
                frame_size += 2;
 
                /* Write one frame to device */
-               mxt_fw_write(client, fw->data + pos, frame_size);
-
-               ret = mxt_check_bootloader(client,
-                                               MXT_FRAME_CRC_PASS);
+               ret = mxt_bootloader_write(data, fw->data + pos, frame_size);
                if (ret)
-                       goto out;
+                       goto disable_irq;
+
+               ret = mxt_check_bootloader(data, MXT_FRAME_CRC_PASS, true);
+               if (ret) {
+                       retry++;
 
-               pos += frame_size;
+                       /* Back off by 20ms per retry */
+                       msleep(retry * 20);
 
-               dev_dbg(dev, "Updated %d bytes / %zd bytes\n", pos, fw->size);
+                       if (retry > 20) {
+                               dev_err(dev, "Retry count exceeded\n");
+                               goto disable_irq;
+                       }
+               } else {
+                       retry = 0;
+                       pos += frame_size;
+                       frame++;
+               }
+
+               if (frame % 50 == 0)
+                       dev_dbg(dev, "Sent %d frames, %d/%zd bytes\n",
+                               frame, pos, fw->size);
        }
 
-out:
-       release_firmware(fw);
+       /* Wait for flash. */
+       ret = mxt_wait_for_completion(data, &data->bl_completion,
+                                     MXT_FW_RESET_TIME);
+       if (ret)
+               goto disable_irq;
+
+       dev_dbg(dev, "Sent %d frames, %d bytes\n", frame, pos);
+
+       /*
+        * Wait for device to reset. Some bootloader versions do not assert
+        * the CHG line after bootloading has finished, so ignore potential
+        * errors.
+        */
+       mxt_wait_for_completion(data, &data->bl_completion, MXT_FW_RESET_TIME);
 
-       /* Change to slave address of application */
-       if (client->addr == MXT_BOOT_LOW)
-               client->addr = MXT_APP_LOW;
-       else
-               client->addr = MXT_APP_HIGH;
+       data->in_bootloader = false;
 
+disable_irq:
+       disable_irq(data->irq);
+release_firmware:
+       release_firmware(fw);
        return ret;
 }
 
@@ -1053,29 +1815,18 @@ static ssize_t mxt_update_fw_store(struct device *dev,
        struct mxt_data *data = dev_get_drvdata(dev);
        int error;
 
-       disable_irq(data->irq);
-
        error = mxt_load_fw(dev, MXT_FW_NAME);
        if (error) {
                dev_err(dev, "The firmware update failed(%d)\n", error);
                count = error;
        } else {
-               dev_dbg(dev, "The firmware update succeeded\n");
+               dev_info(dev, "The firmware update succeeded\n");
 
-               /* Wait for reset */
-               msleep(MXT_FWRESET_TIME);
-
-               mxt_free_object_table(data);
-
-               mxt_initialize(data);
+               error = mxt_initialize(data);
+               if (error)
+                       return error;
        }
 
-       enable_irq(data->irq);
-
-       error = mxt_make_highchg(data);
-       if (error)
-               return error;
-
        return count;
 }
 
@@ -1126,134 +1877,112 @@ static void mxt_input_close(struct input_dev *dev)
        mxt_stop(data);
 }
 
-static int mxt_probe(struct i2c_client *client,
-               const struct i2c_device_id *id)
+#ifdef CONFIG_OF
+static struct mxt_platform_data *mxt_parse_dt(struct i2c_client *client)
 {
-       const struct mxt_platform_data *pdata = dev_get_platdata(&client->dev);
-       struct mxt_data *data;
-       struct input_dev *input_dev;
-       int error;
-       unsigned int num_mt_slots;
-
-       if (!pdata)
-               return -EINVAL;
-
-       data = kzalloc(sizeof(struct mxt_data), GFP_KERNEL);
-       input_dev = input_allocate_device();
-       if (!data || !input_dev) {
-               dev_err(&client->dev, "Failed to allocate memory\n");
-               error = -ENOMEM;
-               goto err_free_mem;
-       }
-
-       data->is_tp = pdata && pdata->is_tp;
+       struct mxt_platform_data *pdata;
+       u32 *keymap;
+       u32 keycode;
+       int proplen, i, ret;
 
-       input_dev->name = (data->is_tp) ? "Atmel maXTouch Touchpad" :
-                                         "Atmel maXTouch Touchscreen";
-       snprintf(data->phys, sizeof(data->phys), "i2c-%u-%04x/input0",
-                client->adapter->nr, client->addr);
+       if (!client->dev.of_node)
+               return ERR_PTR(-ENODEV);
 
-       input_dev->phys = data->phys;
+       pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL);
+       if (!pdata)
+               return ERR_PTR(-ENOMEM);
 
-       input_dev->id.bustype = BUS_I2C;
-       input_dev->dev.parent = &client->dev;
-       input_dev->open = mxt_input_open;
-       input_dev->close = mxt_input_close;
+       if (of_find_property(client->dev.of_node, "linux,gpio-keymap",
+                            &proplen)) {
+               pdata->t19_num_keys = proplen / sizeof(u32);
 
-       data->client = client;
-       data->input_dev = input_dev;
-       data->pdata = pdata;
-       data->irq = client->irq;
-
-       mxt_calc_resolution(data);
+               keymap = devm_kzalloc(&client->dev,
+                               pdata->t19_num_keys * sizeof(keymap[0]),
+                               GFP_KERNEL);
+               if (!keymap)
+                       return ERR_PTR(-ENOMEM);
 
-       error = mxt_initialize(data);
-       if (error)
-               goto err_free_mem;
+               for (i = 0; i < pdata->t19_num_keys; i++) {
+                       ret = of_property_read_u32_index(client->dev.of_node,
+                                       "linux,gpio-keymap", i, &keycode);
+                       if (ret)
+                               keycode = KEY_RESERVED;
 
-       __set_bit(EV_ABS, input_dev->evbit);
-       __set_bit(EV_KEY, input_dev->evbit);
-       __set_bit(BTN_TOUCH, input_dev->keybit);
+                       keymap[i] = keycode;
+               }
 
-       if (data->is_tp) {
-               int i;
-               __set_bit(INPUT_PROP_POINTER, input_dev->propbit);
-               __set_bit(INPUT_PROP_BUTTONPAD, input_dev->propbit);
+               pdata->t19_keymap = keymap;
+       }
 
-               for (i = 0; i < MXT_NUM_GPIO; i++)
-                       if (pdata->key_map[i] != KEY_RESERVED)
-                               __set_bit(pdata->key_map[i], input_dev->keybit);
+       return pdata;
+}
+#else
+static struct mxt_platform_data *mxt_parse_dt(struct i2c_client *client)
+{
+       dev_dbg(&client->dev, "No platform data specified\n");
+       return ERR_PTR(-EINVAL);
+}
+#endif
 
-               __set_bit(BTN_TOOL_FINGER, input_dev->keybit);
-               __set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit);
-               __set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit);
-               __set_bit(BTN_TOOL_QUADTAP, input_dev->keybit);
-               __set_bit(BTN_TOOL_QUINTTAP, input_dev->keybit);
+static int mxt_probe(struct i2c_client *client, const struct i2c_device_id *id)
+{
+       struct mxt_data *data;
+       const struct mxt_platform_data *pdata;
+       int error;
 
-               input_abs_set_res(input_dev, ABS_X, MXT_PIXELS_PER_MM);
-               input_abs_set_res(input_dev, ABS_Y, MXT_PIXELS_PER_MM);
-               input_abs_set_res(input_dev, ABS_MT_POSITION_X,
-                                 MXT_PIXELS_PER_MM);
-               input_abs_set_res(input_dev, ABS_MT_POSITION_Y,
-                                 MXT_PIXELS_PER_MM);
+       pdata = dev_get_platdata(&client->dev);
+       if (!pdata) {
+               pdata = mxt_parse_dt(client);
+               if (IS_ERR(pdata))
+                       return PTR_ERR(pdata);
        }
 
-       /* For single touch */
-       input_set_abs_params(input_dev, ABS_X,
-                            0, data->max_x, 0, 0);
-       input_set_abs_params(input_dev, ABS_Y,
-                            0, data->max_y, 0, 0);
-       input_set_abs_params(input_dev, ABS_PRESSURE,
-                            0, 255, 0, 0);
+       data = kzalloc(sizeof(struct mxt_data), GFP_KERNEL);
+       if (!data) {
+               dev_err(&client->dev, "Failed to allocate memory\n");
+               return -ENOMEM;
+       }
 
-       /* For multi touch */
-       num_mt_slots = data->T9_reportid_max - data->T9_reportid_min + 1;
-       error = input_mt_init_slots(input_dev, num_mt_slots, 0);
-       if (error)
-               goto err_free_object;
-       input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR,
-                            0, MXT_MAX_AREA, 0, 0);
-       input_set_abs_params(input_dev, ABS_MT_POSITION_X,
-                            0, data->max_x, 0, 0);
-       input_set_abs_params(input_dev, ABS_MT_POSITION_Y,
-                            0, data->max_y, 0, 0);
-       input_set_abs_params(input_dev, ABS_MT_PRESSURE,
-                            0, 255, 0, 0);
+       snprintf(data->phys, sizeof(data->phys), "i2c-%u-%04x/input0",
+                client->adapter->nr, client->addr);
 
-       input_set_drvdata(input_dev, data);
+       data->client = client;
+       data->pdata = pdata;
+       data->irq = client->irq;
        i2c_set_clientdata(client, data);
 
+       init_completion(&data->bl_completion);
+       init_completion(&data->reset_completion);
+       init_completion(&data->crc_completion);
+
        error = request_threaded_irq(client->irq, NULL, mxt_interrupt,
                                     pdata->irqflags | IRQF_ONESHOT,
                                     client->name, data);
        if (error) {
                dev_err(&client->dev, "Failed to register interrupt\n");
-               goto err_free_object;
+               goto err_free_mem;
        }
 
-       error = mxt_make_highchg(data);
-       if (error)
-               goto err_free_irq;
+       disable_irq(client->irq);
 
-       error = input_register_device(input_dev);
+       error = mxt_initialize(data);
        if (error)
                goto err_free_irq;
 
        error = sysfs_create_group(&client->dev.kobj, &mxt_attr_group);
-       if (error)
-               goto err_unregister_device;
+       if (error) {
+               dev_err(&client->dev, "Failure %d creating sysfs group\n",
+                       error);
+               goto err_free_object;
+       }
 
        return 0;
 
-err_unregister_device:
-       input_unregister_device(input_dev);
-       input_dev = NULL;
+err_free_object:
+       mxt_free_object_table(data);
 err_free_irq:
        free_irq(client->irq, data);
-err_free_object:
-       kfree(data->object_table);
 err_free_mem:
-       input_free_device(input_dev);
        kfree(data);
        return error;
 }
@@ -1265,7 +1994,7 @@ static int mxt_remove(struct i2c_client *client)
        sysfs_remove_group(&client->dev.kobj, &mxt_attr_group);
        free_irq(data->irq, data);
        input_unregister_device(data->input_dev);
-       kfree(data->object_table);
+       mxt_free_object_table(data);
        kfree(data);
 
        return 0;
@@ -1294,11 +2023,7 @@ static int mxt_resume(struct device *dev)
        struct mxt_data *data = i2c_get_clientdata(client);
        struct input_dev *input_dev = data->input_dev;
 
-       /* Soft reset */
-       mxt_write_object(data, MXT_GEN_COMMAND_T6,
-                       MXT_COMMAND_RESET, 1);
-
-       msleep(MXT_RESET_TIME);
+       mxt_soft_reset(data);
 
        mutex_lock(&input_dev->mutex);
 
@@ -1313,6 +2038,12 @@ static int mxt_resume(struct device *dev)
 
 static SIMPLE_DEV_PM_OPS(mxt_pm_ops, mxt_suspend, mxt_resume);
 
+static const struct of_device_id mxt_of_match[] = {
+       { .compatible = "atmel,maxtouch", },
+       {},
+};
+MODULE_DEVICE_TABLE(of, mxt_of_match);
+
 static const struct i2c_device_id mxt_id[] = {
        { "qt602240_ts", 0 },
        { "atmel_mxt_ts", 0 },
@@ -1326,6 +2057,7 @@ static struct i2c_driver mxt_driver = {
        .driver = {
                .name   = "atmel_mxt_ts",
                .owner  = THIS_MODULE,
+               .of_match_table = of_match_ptr(mxt_of_match),
                .pm     = &mxt_pm_ops,
        },
        .probe          = mxt_probe,