From d723ec756638ccaf147c3a5de7dabf1f9a29687e Mon Sep 17 00:00:00 2001 From: Dominik Sliwa Date: Thu, 22 Mar 2018 11:47:34 +0100 Subject: input: touchscreen: atmel_mxt_ts: backport from kernel 4.9 Signed-off-by: Dominik Sliwa Acked-by: Marcel Ziswiler --- drivers/input/touchscreen/atmel_mxt_ts.c | 3861 ++++++++++++++++------------ include/linux/i2c/atmel_mxt_ts.h | 51 - include/linux/platform_data/atmel_mxt_ts.h | 31 + 3 files changed, 2236 insertions(+), 1707 deletions(-) delete mode 100644 include/linux/i2c/atmel_mxt_ts.h create mode 100644 include/linux/platform_data/atmel_mxt_ts.h diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index e676fa96ddad..c50620255888 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -2,8 +2,10 @@ * Atmel maXTouch Touchscreen driver * * Copyright (C) 2010 Samsung Electronics Co.Ltd - * Copyright (C) 2011 Atmel Corporation - * Copyright (C) 2011-2013 NVIDIA Corporation + * Copyright (C) 2011-2014 Atmel Corporation + * Copyright (C) 2012 Google, Inc. + * Copyright (C) 2016 Zodiac Inflight Innovations + * * Author: Joonyoung Shim * * This program is free software; you can redistribute it and/or modify it @@ -13,41 +15,34 @@ * */ +#include +#include #include #include +#include #include #include #include -#include +#include #include #include +#include #include -#include - -#define CREATE_TRACE_POINTS -#include - -/* Version */ -#define MXT_VER_20 20 -#define MXT_VER_21 21 -#define MXT_VER_22 22 +#include +#include +#include +#include +#include /* Firmware files */ #define MXT_FW_NAME "maxtouch.fw" +#define MXT_CFG_NAME "maxtouch.cfg" #define MXT_CFG_MAGIC "OBP_RAW V1" /* Registers */ -#define MXT_FAMILY_ID 0x00 -#define MXT_VARIANT_ID 0x01 -#define MXT_VERSION 0x02 -#define MXT_BUILD 0x03 -#define MXT_MATRIX_X_SIZE 0x04 -#define MXT_MATRIX_Y_SIZE 0x05 -#define MXT_OBJECT_NUM 0x06 #define MXT_OBJECT_START 0x07 - #define MXT_OBJECT_SIZE 6 - +#define MXT_INFO_CHECKSUM_SIZE 3 #define MXT_MAX_BLOCK_WRITE 256 /* Object types */ @@ -63,7 +58,6 @@ #define MXT_TOUCH_PROXKEY_T52 52 #define MXT_PROCI_GRIPFACE_T20 20 #define MXT_PROCG_NOISE_T22 22 -#define MXT_PROCI_ACTIVE_STYLUS_T63 63 #define MXT_PROCI_ONETOUCH_T24 24 #define MXT_PROCI_TWOTOUCH_T27 27 #define MXT_PROCI_GRIP_T40 40 @@ -79,7 +73,7 @@ #define MXT_SPT_DIGITIZER_T43 43 #define MXT_SPT_MESSAGECOUNT_T44 44 #define MXT_SPT_CTECONFIG_T46 46 -#define MXT_SPT_NOISESUPPRESSION_T48 48 +#define MXT_TOUCH_MULTITOUCHSCREEN_T100 100 /* MXT_GEN_MESSAGE_T5 object */ #define MXT_RPTID_NOMSG 0xff @@ -91,129 +85,118 @@ #define MXT_COMMAND_REPORTALL 3 #define MXT_COMMAND_DIAGNOSTIC 5 +/* Define for T6 status byte */ +#define MXT_T6_STATUS_RESET (1 << 7) +#define MXT_T6_STATUS_OFL (1 << 6) +#define MXT_T6_STATUS_SIGERR (1 << 5) +#define MXT_T6_STATUS_CAL (1 << 4) +#define MXT_T6_STATUS_CFGERR (1 << 3) +#define MXT_T6_STATUS_COMSERR (1 << 2) + /* MXT_GEN_POWER_T7 field */ -#define MXT_POWER_IDLEACQINT 0 -#define MXT_POWER_ACTVACQINT 1 -#define MXT_POWER_ACTV2IDLETO 2 +struct t7_config { + u8 idle; + u8 active; +} __packed; #define MXT_POWER_CFG_RUN 0 #define MXT_POWER_CFG_DEEPSLEEP 1 -/* MXT_GEN_ACQUIRE_T8 field */ -#define MXT_ACQUIRE_CHRGTIME 0 -#define MXT_ACQUIRE_TCHDRIFT 2 -#define MXT_ACQUIRE_DRIFTST 3 -#define MXT_ACQUIRE_TCHAUTOCAL 4 -#define MXT_ACQUIRE_SYNC 5 -#define MXT_ACQUIRE_ATCHCALST 6 -#define MXT_ACQUIRE_ATCHCALSTHR 7 - /* 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 - -/* MXT_PROCI_GRIPFACE_T20 field */ -#define MXT_GRIPFACE_CTRL 0 -#define MXT_GRIPFACE_XLOGRIP 1 -#define MXT_GRIPFACE_XHIGRIP 2 -#define MXT_GRIPFACE_YLOGRIP 3 -#define MXT_GRIPFACE_YHIGRIP 4 -#define MXT_GRIPFACE_MAXTCHS 5 -#define MXT_GRIPFACE_SZTHR1 7 -#define MXT_GRIPFACE_SZTHR2 8 -#define MXT_GRIPFACE_SHPTHR1 9 -#define MXT_GRIPFACE_SHPTHR2 10 -#define MXT_GRIPFACE_SUPEXTTO 11 - -/* MXT_PROCI_NOISE field */ -#define MXT_NOISE_CTRL 0 -#define MXT_NOISE_OUTFLEN 1 -#define MXT_NOISE_GCAFUL_LSB 3 -#define MXT_NOISE_GCAFUL_MSB 4 -#define MXT_NOISE_GCAFLL_LSB 5 -#define MXT_NOISE_GCAFLL_MSB 6 -#define MXT_NOISE_ACTVGCAFVALID 7 -#define MXT_NOISE_NOISETHR 8 -#define MXT_NOISE_FREQHOPSCALE 10 -#define MXT_NOISE_FREQ0 11 -#define MXT_NOISE_FREQ1 12 -#define MXT_NOISE_FREQ2 13 -#define MXT_NOISE_FREQ3 14 -#define MXT_NOISE_FREQ4 15 -#define MXT_NOISE_IDLEGCAFVALID 16 +#define MXT_T9_CTRL 0 +#define MXT_T9_XSIZE 3 +#define MXT_T9_YSIZE 4 +#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 { + __le16 x; + __le16 y; +} __packed; + +/* MXT_TOUCH_MULTI_T9 orient */ +#define MXT_T9_ORIENT_SWITCH (1 << 0) +#define MXT_T9_ORIENT_INVERTX (1 << 1) +#define MXT_T9_ORIENT_INVERTY (1 << 2) /* MXT_SPT_COMMSCONFIG_T18 */ #define MXT_COMMS_CTRL 0 #define MXT_COMMS_CMD 1 -/* MXT_SPT_CTECONFIG_T28 field */ -#define MXT_CTE_CTRL 0 -#define MXT_CTE_CMD 1 -#define MXT_CTE_MODE 2 -#define MXT_CTE_IDLEGCAFDEPTH 3 -#define MXT_CTE_ACTVGCAFDEPTH 4 -#define MXT_CTE_VOLTAGE 5 - -#define MXT_VOLTAGE_DEFAULT 2700000 -#define MXT_VOLTAGE_STEP 10000 - -/* Defines for Suspend/Resume */ -#define MXT_SUSPEND_STATIC 0 -#define MXT_SUSPEND_DYNAMIC 1 -#define MXT_T7_IDLEACQ_DISABLE 0 -#define MXT_T7_ACTVACQ_DISABLE 0 -#define MXT_T7_ACTV2IDLE_DISABLE 0 -#define MXT_T9_DISABLE 0 -#define MXT_T9_ENABLE 0x83 -#define MXT_T22_DISABLE 0 +/* MXT_DEBUG_DIAGNOSTIC_T37 */ +#define MXT_DIAGNOSTIC_PAGEUP 0x01 +#define MXT_DIAGNOSTIC_DELTAS 0x10 +#define MXT_DIAGNOSTIC_REFS 0x11 +#define MXT_DIAGNOSTIC_SIZE 128 + +#define MXT_FAMILY_1386 160 +#define MXT1386_COLUMNS 3 +#define MXT1386_PAGES_PER_COLUMN 8 + +struct t37_debug { +#ifdef CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 + u8 mode; + u8 page; + u8 data[MXT_DIAGNOSTIC_SIZE]; +#endif +}; /* Define for MXT_GEN_COMMAND_T6 */ #define MXT_BOOT_VALUE 0xa5 #define MXT_RESET_VALUE 0x01 #define MXT_BACKUP_VALUE 0x55 -/* Define for MXT_PROCG_NOISESUPPRESSION_T42 */ -#define MXT_T42_MSG_TCHSUP (1 << 0) +/* T100 Multiple Touch Touchscreen */ +#define MXT_T100_CTRL 0 +#define MXT_T100_CFG1 1 +#define MXT_T100_TCHAUX 3 +#define MXT_T100_XSIZE 9 +#define MXT_T100_XRANGE 13 +#define MXT_T100_YSIZE 20 +#define MXT_T100_YRANGE 24 + +#define MXT_T100_CFG_SWITCHXY BIT(5) +#define MXT_T100_CFG_INVERTY BIT(6) +#define MXT_T100_CFG_INVERTX BIT(7) + +#define MXT_T100_TCHAUX_VECT BIT(0) +#define MXT_T100_TCHAUX_AMPL BIT(1) +#define MXT_T100_TCHAUX_AREA BIT(2) + +#define MXT_T100_DETECT BIT(7) +#define MXT_T100_TYPE_MASK 0x70 + +enum t100_type { + MXT_T100_TYPE_FINGER = 1, + MXT_T100_TYPE_PASSIVE_STYLUS = 2, + MXT_T100_TYPE_HOVERING_FINGER = 4, + MXT_T100_TYPE_GLOVE = 5, + MXT_T100_TYPE_LARGE_TOUCH = 6, +}; + +#define MXT_DISTANCE_ACTIVE_TOUCH 0 +#define MXT_DISTANCE_HOVERING 1 + +#define MXT_TOUCH_MAJOR_DEFAULT 1 +#define MXT_PRESSURE_DEFAULT 1 /* Delay times */ -#define MXT_BACKUP_TIME 25 /* msec */ +#define MXT_BACKUP_TIME 50 /* msec */ #define MXT_RESET_TIME 200 /* msec */ -#define MXT_RESET_NOCHGREAD 400 /* msec */ -#define MXT_FWRESET_TIME 1000 /* msec */ -#define MXT_WAKEUP_TIME 25 /* msec */ - -/* Defines for MXT_SLOWSCAN_EXTENSIONS */ -#define SLOSCAN_DISABLE 0 /* Disable slow scan */ -#define SLOSCAN_ENABLE 1 /* Enable slow scan */ -#define SLOSCAN_SET_ACTVACQINT 2 /* Set ACTV scan rate */ -#define SLOSCAN_SET_IDLEACQINT 3 /* Set IDLE scan rate */ -#define SLOSCAN_SET_ACTV2IDLETO 4 /* Set the ACTIVE to IDLE TimeOut */ +#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 @@ -230,50 +213,11 @@ #define MXT_BOOT_EXTENDED_ID (1 << 5) #define MXT_BOOT_ID_MASK 0x1f -/* Define for T6 status byte */ -#define MXT_STATUS_RESET (1 << 7) -#define MXT_STATUS_OFL (1 << 6) -#define MXT_STATUS_SIGERR (1 << 5) -#define MXT_STATUS_CAL (1 << 4) -#define MXT_STATUS_CFGERR (1 << 3) -#define MXT_STATUS_COMSERR (1 << 2) - -/* T9 Touch 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) - -/* Touch orient bits */ -#define MXT_XY_SWITCH (1 << 0) -#define MXT_X_INVERT (1 << 1) -#define MXT_Y_INVERT (1 << 2) - -/* T63 Stylus */ -#define MXT_STYLUS_PRESS (1 << 0) -#define MXT_STYLUS_RELEASE (1 << 1) -#define MXT_STYLUS_MOVE (1 << 2) -#define MXT_STYLUS_SUPPRESS (1 << 3) - -#define MXT_STYLUS_DETECT (1 << 4) -#define MXT_STYLUS_TIP (1 << 5) -#define MXT_STYLUS_ERASER (1 << 6) -#define MXT_STYLUS_BARREL (1 << 7) - -#define MXT_STYLUS_PRESSURE_MASK 0x3F - -/* T15 Key array */ -int mxt_t15_keys[] = { }; - -static unsigned long mxt_t15_keystatus; - /* Touchscreen absolute values */ #define MXT_MAX_AREA 0xff +#define MXT_PIXELS_PER_MM 20 + struct mxt_info { u8 family_id; u8 variant_id; @@ -287,116 +231,180 @@ struct mxt_info { struct mxt_object { u8 type; u16 start_address; - u16 size; - u16 instances; + u8 size_minus_one; + u8 instances_minus_one; u8 num_report_ids; +} __packed; + +struct mxt_dbg { + u16 t37_address; + u16 diag_cmd_address; + struct t37_debug *t37_buf; + unsigned int t37_pages; + unsigned int t37_nodes; + + struct v4l2_device v4l2; + struct v4l2_pix_format format; + struct video_device vdev; + struct vb2_queue queue; + struct mutex lock; + int input; +}; - /* to map object and message */ - u8 min_reportid; - u8 max_reportid; +enum v4l_dbg_inputs { + MXT_V4L_INPUT_DELTAS, + MXT_V4L_INPUT_REFS, + MXT_V4L_INPUT_MAX, }; -enum mxt_device_state { INIT, APPMODE, BOOTLOADER, FAILED, SHUTDOWN }; +static inline void reinit_completion(struct completion *x) +{ + x->done = 0; +} -/* This structure is used to save/restore values during suspend/resume */ -struct mxt_suspend { - u8 suspend_obj; - u8 suspend_reg; - u8 suspend_val; - u8 suspend_flags; - u8 restore_val; +#ifdef CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 +static const struct v4l2_file_operations mxt_video_fops = { + .owner = THIS_MODULE, + .open = v4l2_fh_open, + .release = vb2_fop_release, + .unlocked_ioctl = video_ioctl2, + .read = vb2_fop_read, + .mmap = vb2_fop_mmap, + .poll = vb2_fop_poll, }; +#endif /* Each client has this additional data */ struct mxt_data { struct i2c_client *client; struct input_dev *input_dev; + char phys[64]; /* device physical location */ const struct mxt_platform_data *pdata; - enum mxt_device_state state; struct mxt_object *object_table; - struct regulator *regulator_vdd; - struct regulator *regulator_avdd; - u16 mem_size; struct mxt_info info; unsigned int irq; unsigned int max_x; unsigned int max_y; - struct bin_attribute mem_access_attr; - bool debug_enabled; - bool driver_paused; - u8 bootloader_addr; - u8 actv_cycle_time; - u8 idle_cycle_time; - u8 actv2idle_timeout; - u8 is_stopped; + bool invertx; + bool inverty; + bool xy_switch; + u8 xsize; + u8 ysize; + bool in_bootloader; + u16 mem_size; + u8 t100_aux_ampl; + u8 t100_aux_area; + u8 t100_aux_vect; u8 max_reportid; u32 config_crc; - u32 info_block_crc; - u8 num_touchids; - u8 num_stylusids; + u32 info_crc; + u8 bootloader_addr; u8 *msg_buf; + u8 t6_status; + bool update_input; u8 last_message_count; - - /* Slowscan parameters */ - int slowscan_enabled; - u8 slowscan_actv_cycle_time; - u8 slowscan_idle_cycle_time; - u8 slowscan_actv2idle_timeout; - u8 slowscan_shad_actv_cycle_time; - u8 slowscan_shad_idle_cycle_time; - u8 slowscan_shad_actv2idle_timeout; + u8 num_touchids; + u8 multitouch; + struct t7_config t7_cfg; + struct mxt_dbg dbg; /* Cached parameters from object table */ u16 T5_address; u8 T5_msg_size; u8 T6_reportid; + u16 T6_address; u16 T7_address; u8 T9_reportid_min; u8 T9_reportid_max; - u8 T15_reportid_min; - u8 T15_reportid_max; - u8 T42_reportid_min; - u8 T42_reportid_max; + u8 T19_reportid; u16 T44_address; - u8 T48_reportid; - u8 T63_reportid_min; - u8 T63_reportid_max; -}; + u8 T100_reportid_min; + u8 T100_reportid_max; -static struct mxt_suspend mxt_save[] = { - {MXT_TOUCH_MULTI_T9, MXT_TOUCH_CTRL, - MXT_T9_DISABLE, MXT_SUSPEND_DYNAMIC, 0}, - {MXT_PROCG_NOISE_T22, MXT_NOISE_CTRL, - MXT_T22_DISABLE, MXT_SUSPEND_DYNAMIC, 0}, - {MXT_GEN_POWER_T7, MXT_POWER_IDLEACQINT, - MXT_T7_IDLEACQ_DISABLE, MXT_SUSPEND_DYNAMIC, 0}, - {MXT_GEN_POWER_T7, MXT_POWER_ACTVACQINT, - MXT_T7_ACTVACQ_DISABLE, MXT_SUSPEND_DYNAMIC, 0}, - {MXT_GEN_POWER_T7, MXT_POWER_ACTV2IDLETO, - MXT_T7_ACTV2IDLE_DISABLE, MXT_SUSPEND_DYNAMIC, 0} -}; + /* for fw update in bootloader */ + struct completion bl_completion; -/* I2C slave address pairs */ -struct mxt_i2c_address_pair { - u8 bootloader; - u8 application; + /* for reset handling */ + struct completion reset_completion; + + /* for config update handling */ + struct completion crc_completion; }; -static const struct mxt_i2c_address_pair mxt_i2c_addresses[] = { -#ifdef BOOTLOADER_1664_1188 - { 0x26, 0x4a }, - { 0x27, 0x4b }, -#else - { 0x24, 0x4a }, - { 0x25, 0x4b }, - { 0x26, 0x4c }, - { 0x27, 0x4d }, - { 0x34, 0x5a }, - { 0x35, 0x5b }, -#endif +struct mxt_vb2_buffer { + struct vb2_buffer vb; + struct list_head list; }; -static int mxt_bootloader_read(struct mxt_data *data, u8 *val, unsigned int count) +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) { + case MXT_GEN_COMMAND_T6: + case MXT_GEN_POWER_T7: + case MXT_GEN_ACQUIRE_T8: + case MXT_GEN_DATASOURCE_T53: + 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_USERDATA_T38: + case MXT_SPT_DIGITIZER_T43: + case MXT_SPT_CTECONFIG_T46: + return true; + default: + return false; + } +} + +static void mxt_dump_message(struct mxt_data *data, u8 *message) +{ + 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; @@ -408,12 +416,19 @@ static int mxt_bootloader_read(struct mxt_data *data, u8 *val, unsigned int coun 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 == 1) ? 0 : ret; + return ret; } -static int mxt_bootloader_write(struct mxt_data *data, const u8 * const val, - unsigned int count) +static int mxt_bootloader_write(struct mxt_data *data, + const u8 * const val, unsigned int count) { int ret; struct i2c_msg msg; @@ -424,74 +439,69 @@ static int mxt_bootloader_write(struct mxt_data *data, const u8 * const val, 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 == 1) ? 0 : ret; + return ret; } -static int mxt_get_bootloader_address(struct mxt_data *data) +static int mxt_lookup_bootloader_address(struct mxt_data *data, bool retry) { - struct i2c_client *client = data->client; - int i; - - for (i = 0; i < ARRAY_SIZE(mxt_i2c_addresses); i++) { - if (mxt_i2c_addresses[i].application == client->addr) { - data->bootloader_addr = mxt_i2c_addresses[i].bootloader; - - dev_info(&client->dev, "Bootloader i2c addr: 0x%02x\n", - data->bootloader_addr); + u8 appmode = data->client->addr; + u8 bootloader; - return 0; + 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: + dev_err(&data->client->dev, + "Appmode i2c address 0x%02x not found\n", + appmode); + return -EINVAL; } - dev_err(&client->dev, "Address 0x%02x not found in address table\n", - client->addr); - return -EINVAL; + data->bootloader_addr = bootloader; + return 0; } -static int mxt_probe_bootloader(struct mxt_data *data) +static int mxt_probe_bootloader(struct mxt_data *data, bool alt_address) { struct device *dev = &data->client->dev; - int ret; + int error; u8 val; bool crc_failure; - ret = mxt_get_bootloader_address(data); - if (ret) - return ret; + error = mxt_lookup_bootloader_address(data, alt_address); + if (error) + return error; - ret = mxt_bootloader_read(data, &val, 1); - if (ret) { - dev_err(dev, "%s: i2c recv failed\n", __func__); - return -EIO; - } + error = mxt_bootloader_read(data, &val, 1); + if (error) + return error; /* 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 int mxt_wait_for_chg(struct mxt_data *data) -{ - int timeout_counter = 0; - int count = 1E6; - - if (data->pdata->read_chg == NULL) { - msleep(10); - return 0; - } - - while ((timeout_counter++ <= count) && data->pdata->read_chg()) - udelay(20); - - if (timeout_counter > count) { - dev_err(&data->client->dev, "mxt_wait_for_chg() timeout!\n"); - return -EIO; - } + val, crc_failure ? ", APP_CRC_FAIL" : ""); return 0; } @@ -504,49 +514,63 @@ static u8 mxt_get_bootloader_version(struct mxt_data *data, u8 val) if (val & MXT_BOOT_EXTENDED_ID) { if (mxt_bootloader_read(data, &buf[0], 3) != 0) { dev_err(dev, "%s: i2c failure\n", __func__); - return -EIO; + return val; } - dev_info(dev, "Bootloader ID:%d Version:%d\n", buf[1], buf[2]); + dev_dbg(dev, "Bootloader ID:%d Version:%d\n", buf[1], buf[2]); return buf[0]; } else { - dev_info(dev, "Bootloader ID:%d\n", val & MXT_BOOT_ID_MASK); + dev_dbg(dev, "Bootloader ID:%d\n", val & MXT_BOOT_ID_MASK); return val; } } -static int mxt_check_bootloader(struct mxt_data *data, - unsigned int state) +static int mxt_check_bootloader(struct mxt_data *data, unsigned int state, + bool wait) { struct device *dev = &data->client->dev; - int ret; u8 val; + int ret; recheck: + 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) { - dev_err(dev, "%s: i2c recv failed, ret=%d\n", - __func__, ret); + if (ret) return ret; - } - if (state == MXT_WAITING_BOOTLOAD_CMD) { + if (state == MXT_WAITING_BOOTLOAD_CMD) val = mxt_get_bootloader_version(data, val); - } switch (state) { case MXT_WAITING_BOOTLOAD_CMD: - val &= ~MXT_BOOT_STATUS_MASK; - break; 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) { - mxt_wait_for_chg(data); goto recheck; } else if (val == MXT_FRAME_CRC_FAIL) { dev_err(dev, "Bootloader CRC fail\n"); @@ -558,7 +582,8 @@ recheck: } if (val != state) { - dev_err(dev, "Invalid bootloader mode state 0x%02X\n", val); + dev_err(dev, "Invalid bootloader state %02X != %02X\n", + val, state); return -EINVAL; } @@ -579,23 +604,18 @@ static int mxt_send_bootloader_cmd(struct mxt_data *data, bool unlock) } ret = mxt_bootloader_write(data, buf, 2); - if (ret) { - dev_err(&data->client->dev, "%s: i2c send failed, ret=%d\n", - __func__, ret); + if (ret) return ret; - } return 0; } -static int mxt_read_reg(struct i2c_client *client, - u16 reg, u16 len, void *val) +static int __mxt_read_reg(struct i2c_client *client, + u16 reg, u16 len, void *val) { - struct device *dev = &client->dev; struct i2c_msg xfer[2]; u8 buf[2]; int ret; - u8 retry = 0; buf[0] = reg & 0xff; buf[1] = (reg >> 8) & 0xff; @@ -612,74 +632,56 @@ static int mxt_read_reg(struct i2c_client *client, xfer[1].len = len; xfer[1].buf = val; -retry_read: - ret = i2c_transfer(client->adapter, xfer, ARRAY_SIZE(xfer)); - if (ret != ARRAY_SIZE(xfer)) { - if (!retry) { - dev_dbg(dev, "%s: i2c retry\n", __func__); - msleep(MXT_WAKEUP_TIME); - retry = 1; - goto retry_read; - } else { - dev_err(dev, "%s: i2c transfer failed (%d)\n", - __func__, ret); - return -EIO; - } + ret = i2c_transfer(client->adapter, xfer, 2); + if (ret == 2) { + ret = 0; + } else { + if (ret >= 0) + ret = -EIO; + dev_err(&client->dev, "%s: i2c transfer failed (%d)\n", + __func__, ret); } - return 0; + return ret; } -static int mxt_write_reg(struct i2c_client *client, u16 reg, u8 val) +static int __mxt_write_reg(struct i2c_client *client, u16 reg, u16 len, + const void *val) { - struct device *dev = &client->dev; - u8 retry = 0; - u8 buf[3]; + u8 *buf; + size_t count; + int ret; + + count = len + 2; + buf = kmalloc(count, GFP_KERNEL); + if (!buf) + return -ENOMEM; buf[0] = reg & 0xff; buf[1] = (reg >> 8) & 0xff; - buf[2] = val; + memcpy(&buf[2], val, len); -retry_write: - if (i2c_master_send(client, buf, 3) != 3) { - if (!retry) { - dev_dbg(dev, "%s: i2c retry\n", __func__); - msleep(MXT_WAKEUP_TIME); - retry = 1; - goto retry_write; - } else { - dev_err(dev, "%s: i2c send failed\n", __func__); - return -EIO; - } + ret = i2c_master_send(client, buf, count); + if (ret == count) { + ret = 0; + } else { + if (ret >= 0) + ret = -EIO; + dev_err(&client->dev, "%s: i2c send failed (%d)\n", + __func__, ret); } - return 0; + kfree(buf); + return ret; } -int mxt_write_block(struct i2c_client *client, u16 addr, u16 length, u8 *value) +static int mxt_write_reg(struct i2c_client *client, u16 reg, u8 val) { - int i; - struct { - __le16 le_addr; - u8 data[MXT_MAX_BLOCK_WRITE]; - } i2c_block_transfer; - - if (length > MXT_MAX_BLOCK_WRITE) - return -EINVAL; - - memcpy(i2c_block_transfer.data, value, length); - - i2c_block_transfer.le_addr = cpu_to_le16(addr); - - i = i2c_master_send(client, (u8 *) &i2c_block_transfer, length + 2); - - if (i == (length + 2)) - return 0; - else - return -EIO; + return __mxt_write_reg(client, reg, 1, &val); } -static struct mxt_object *mxt_get_object(struct mxt_data *data, u8 type) +static struct mxt_object * +mxt_get_object(struct mxt_data *data, u8 type) { struct mxt_object *object; int i; @@ -690,22 +692,41 @@ static struct mxt_object *mxt_get_object(struct mxt_data *data, u8 type) return object; } - dev_err(&data->client->dev, "Invalid object type T%u\n", type); + dev_warn(&data->client->dev, "Invalid object type T%u\n", type); return NULL; } -static int mxt_read_object(struct mxt_data *data, - u8 type, u8 offset, u8 *val) +static void mxt_proc_t6_messages(struct mxt_data *data, u8 *msg) { - struct mxt_object *object; - u16 reg; + struct device *dev = &data->client->dev; + u8 status = msg[1]; + u32 crc = msg[2] | (msg[3] << 8) | (msg[4] << 16); - object = mxt_get_object(data, type); - if (!object) - return -EINVAL; + complete(&data->crc_completion); - reg = object->start_address; - return mxt_read_reg(data->client, reg + offset, 1, val); + if (crc != data->config_crc) { + data->config_crc = crc; + dev_dbg(dev, "T6 Config Checksum: 0x%06X\n", crc); + } + + /* Detect reset */ + if (status & MXT_T6_STATUS_RESET) + complete(&data->reset_completion); + + /* Output debug if status has changed */ + if (status != data->t6_status) + dev_dbg(dev, "T6 Status 0x%02X%s%s%s%s%s%s%s\n", + status, + status == 0 ? " OK" : "", + status & MXT_T6_STATUS_RESET ? " RESET" : "", + status & MXT_T6_STATUS_OFL ? " OFL" : "", + status & MXT_T6_STATUS_SIGERR ? " SIGERR" : "", + status & MXT_T6_STATUS_CAL ? " CAL" : "", + status & MXT_T6_STATUS_CFGERR ? " CFGERR" : "", + status & MXT_T6_STATUS_COMSERR ? " COMSERR" : ""); + + /* Save current status */ + data->t6_status = status; } static int mxt_write_object(struct mxt_data *data, @@ -715,112 +736,63 @@ static int mxt_write_object(struct mxt_data *data, u16 reg; object = mxt_get_object(data, type); - if (!object || offset >= object->size) - return -EINVAL; - - if (offset >= object->size * object->instances) { - dev_err(&data->client->dev, "Tried to write outside object T%d" - " offset:%d, size:%d\n", type, offset, object->size); + if (!object || offset >= mxt_obj_size(object)) return -EINVAL; - } reg = object->start_address; return mxt_write_reg(data->client, reg + offset, val); } -static int mxt_soft_reset(struct mxt_data *data, u8 value) +static void mxt_input_button(struct mxt_data *data, u8 *message) { - int timeout_counter = 0; - struct device *dev = &data->client->dev; - - dev_info(dev, "Resetting chip\n"); - - mxt_write_object(data, MXT_GEN_COMMAND_T6, - MXT_COMMAND_RESET, value); - - if (data->pdata->read_chg == NULL) { - msleep(MXT_RESET_NOCHGREAD); - } else { - msleep(MXT_RESET_TIME); - - timeout_counter = 0; - while ((timeout_counter++ <= 100) && data->pdata->read_chg()) - msleep(20); - if (timeout_counter > 100) { - dev_err(dev, "No response after reset!\n"); - return -EIO; - } - } - - return 0; -} - -static void mxt_proc_t6_messages(struct mxt_data *data, u8 *msg) -{ - struct device *dev = &data->client->dev; - u32 crc; - u8 status = msg[1]; + struct input_dev *input = data->input_dev; + const struct mxt_platform_data *pdata = data->pdata; + int i; - crc = msg[2] | (msg[3] << 8) | (msg[4] << 16); + for (i = 0; i < pdata->t19_num_keys; i++) { + if (pdata->t19_keymap[i] == KEY_RESERVED) + continue; - if (crc != data->config_crc) { - data->config_crc = crc; - dev_dbg(dev, "T6 cfg crc 0x%06X\n", crc); + /* Active-low switch */ + input_report_key(input, pdata->t19_keymap[i], + !(message[1] & BIT(i))); } - - if (status) - dev_dbg(dev, "T6 status %s%s%s%s%s%s\n", - (status & MXT_STATUS_RESET) ? "RESET " : "", - (status & MXT_STATUS_OFL) ? "OFL " : "", - (status & MXT_STATUS_SIGERR) ? "SIGERR " : "", - (status & MXT_STATUS_CAL) ? "CAL " : "", - (status & MXT_STATUS_CFGERR) ? "CFGERR " : "", - (status & MXT_STATUS_COMSERR) ? "COMSERR " : ""); } static void mxt_input_sync(struct mxt_data *data) { - input_mt_report_pointer_emulation(data->input_dev, false); + input_mt_report_pointer_emulation(data->input_dev, + data->pdata->t19_num_keys); input_sync(data->input_dev); } -static void mxt_proc_t9_messages(struct mxt_data *data, u8 *message) +static void mxt_proc_t9_message(struct mxt_data *data, u8 *message) { struct device *dev = &data->client->dev; struct input_dev *input_dev = data->input_dev; + int id; u8 status; int x; int y; int area; int amplitude; - u8 vector; - int id; - - if (!input_dev || data->driver_paused) - return; id = message[0] - data->T9_reportid_min; - - if (id < 0 || id > data->num_touchids) { - dev_err(dev, "invalid touch id %d, total num touch is %d\n", - id, data->num_touchids); - return; - } - status = message[1]; - x = (message[2] << 4) | ((message[4] >> 4) & 0xf); y = (message[3] << 4) | ((message[4] & 0xf)); + + /* Handle 10/12 bit switching */ if (data->max_x < 1024) x >>= 2; if (data->max_y < 1024) y >>= 2; + area = message[5]; amplitude = message[6]; - vector = message[7]; dev_dbg(dev, - "[%d] %c%c%c%c%c%c%c%c x: %d y: %d area: %d amp: %d vector: %02X\n", + "[%u] %c%c%c%c%c%c%c%c x: %5u y: %5u area: %3u amp: %3u\n", id, (status & MXT_T9_DETECT) ? 'D' : '.', (status & MXT_T9_PRESS) ? 'P' : '.', @@ -830,181 +802,176 @@ static void mxt_proc_t9_messages(struct mxt_data *data, u8 *message) (status & MXT_T9_AMP) ? 'A' : '.', (status & MXT_T9_SUPPRESS) ? 'S' : '.', (status & MXT_T9_UNGRIP) ? 'U' : '.', - x, y, area, amplitude, vector); + x, y, area, amplitude); input_mt_slot(input_dev, id); - if ((status & MXT_T9_DETECT) && (status & MXT_T9_RELEASE)) { - /* Touch in detect, just after being released, so - * get new touch tracking ID */ - input_mt_report_slot_state(input_dev, MT_TOOL_FINGER, 0); - mxt_input_sync(data); - } - if (status & MXT_T9_DETECT) { - /* Touch in detect, report X/Y position */ - input_mt_report_slot_state(input_dev, MT_TOOL_FINGER, 1); + /* + * 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, amplitude); input_report_abs(input_dev, ABS_MT_TOUCH_MAJOR, area); - input_report_abs(input_dev, ABS_MT_ORIENTATION, vector); } else { - /* Touch no longer in detect, so close out slot */ - mxt_input_sync(data); + /* Touch no longer active, close out slot */ input_mt_report_slot_state(input_dev, MT_TOOL_FINGER, 0); } + + data->update_input = true; } -static void mxt_proc_t15_messages(struct mxt_data *data, u8 *msg) +static void mxt_proc_t100_message(struct mxt_data *data, u8 *message) { - struct input_dev *input_dev = data->input_dev; struct device *dev = &data->client->dev; - u8 key; - bool curr_state, new_state; - bool sync = false; - unsigned long keystates = le32_to_cpu(msg[2]); - - for (key = 0; key < ARRAY_SIZE(mxt_t15_keys); key++) { - curr_state = test_bit(key, &mxt_t15_keystatus); - new_state = test_bit(key, &keystates); - - if (!curr_state && new_state) { - dev_dbg(dev, "T15 key press: %u\n", key); - __set_bit(key, &mxt_t15_keystatus); - input_event(input_dev, EV_KEY, mxt_t15_keys[key], 1); - sync = true; - } else if (curr_state && !new_state) { - dev_dbg(dev, "T15 key release: %u\n", key); - __clear_bit(key, &mxt_t15_keystatus); - input_event(input_dev, EV_KEY, mxt_t15_keys[key], 0); - sync = true; - } - } + struct input_dev *input_dev = data->input_dev; + int id; + u8 status; + u8 type = 0; + u16 x; + u16 y; + int distance = 0; + int tool = 0; + u8 major = 0; + u8 pressure = 0; + u8 orientation = 0; + + id = message[0] - data->T100_reportid_min - 2; + + /* ignore SCRSTATUS events */ + if (id < 0) + return; - if (sync) - input_sync(input_dev); -} + status = message[1]; + x = get_unaligned_le16(&message[2]); + y = get_unaligned_le16(&message[4]); -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_T100_DETECT) { + type = (status & MXT_T100_TYPE_MASK) >> 4; - if (status & MXT_T42_MSG_TCHSUP) - dev_info(dev, "T42 suppress\n"); - else - dev_info(dev, "T42 normal\n"); -} + switch (type) { + case MXT_T100_TYPE_HOVERING_FINGER: + tool = MT_TOOL_FINGER; + distance = MXT_DISTANCE_HOVERING; -static int mxt_proc_t48_messages(struct mxt_data *data, u8 *msg) -{ - struct device *dev = &data->client->dev; - u8 status, state; + if (data->t100_aux_vect) + orientation = message[data->t100_aux_vect]; - status = msg[1]; - state = msg[4]; + break; - dev_dbg(dev, "T48 state %d status %02X %s%s%s%s%s\n", - state, - status, - (status & 0x01) ? "FREQCHG " : "", - (status & 0x02) ? "APXCHG " : "", - (status & 0x04) ? "ALGOERR " : "", - (status & 0x10) ? "STATCHG " : "", - (status & 0x20) ? "NLVLCHG " : ""); + case MXT_T100_TYPE_FINGER: + case MXT_T100_TYPE_GLOVE: + tool = MT_TOOL_FINGER; + distance = MXT_DISTANCE_ACTIVE_TOUCH; - return 0; -} + if (data->t100_aux_area) + major = message[data->t100_aux_area]; -static void mxt_proc_t63_messages(struct mxt_data *data, u8 *msg) -{ - struct device *dev = &data->client->dev; - struct input_dev *input_dev = data->input_dev; - u8 id; - u16 x, y; - u8 pressure; + if (data->t100_aux_ampl) + pressure = message[data->t100_aux_ampl]; - if (!input_dev) - return; + if (data->t100_aux_vect) + orientation = message[data->t100_aux_vect]; - /* stylus slots come after touch slots */ - id = data->num_touchids + (msg[0] - data->T63_reportid_min); + break; - if (id < 0 || id > (data->num_touchids + data->num_stylusids)) { - dev_err(dev, "invalid stylus id %d, max slot is %d\n", - id, data->num_stylusids); - return; - } + case MXT_T100_TYPE_PASSIVE_STYLUS: + tool = MT_TOOL_PEN; - x = msg[3] | (msg[4] << 8); - y = msg[5] | (msg[6] << 8); - pressure = msg[7] & MXT_STYLUS_PRESSURE_MASK; + /* + * Passive stylus is reported with size zero so + * hardcode. + */ + major = MXT_TOUCH_MAJOR_DEFAULT; - dev_dbg(dev, - "[%d] %c%c%c%c x: %d y: %d pressure: %d stylus:%c%c%c%c\n", - id, - (msg[1] & MXT_STYLUS_SUPPRESS) ? 'S' : '.', - (msg[1] & MXT_STYLUS_MOVE) ? 'M' : '.', - (msg[1] & MXT_STYLUS_RELEASE) ? 'R' : '.', - (msg[1] & MXT_STYLUS_PRESS) ? 'P' : '.', - x, y, pressure, - (msg[2] & MXT_STYLUS_BARREL) ? 'B' : '.', - (msg[2] & MXT_STYLUS_ERASER) ? 'E' : '.', - (msg[2] & MXT_STYLUS_TIP) ? 'T' : '.', - (msg[2] & MXT_STYLUS_DETECT) ? 'D' : '.'); + if (data->t100_aux_ampl) + pressure = message[data->t100_aux_ampl]; + + break; + + case MXT_T100_TYPE_LARGE_TOUCH: + /* Ignore suppressed touch */ + break; + + default: + dev_dbg(dev, "Unexpected T100 type\n"); + return; + } + } + + /* + * Values reported should be non-zero if tool is touching the + * device + */ + if (!pressure && type != MXT_T100_TYPE_HOVERING_FINGER) + pressure = MXT_PRESSURE_DEFAULT; input_mt_slot(input_dev, id); - if (msg[2] & MXT_STYLUS_DETECT) { - input_mt_report_slot_state(input_dev, MT_TOOL_PEN, 1); + if (status & MXT_T100_DETECT) { + dev_dbg(dev, "[%u] type:%u x:%u y:%u a:%02X p:%02X v:%02X\n", + id, type, x, y, major, pressure, orientation); + + 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_TOUCH_MAJOR, major); input_report_abs(input_dev, ABS_MT_PRESSURE, pressure); + input_report_abs(input_dev, ABS_MT_DISTANCE, distance); + input_report_abs(input_dev, ABS_MT_ORIENTATION, orientation); } else { - input_mt_report_slot_state(input_dev, MT_TOOL_PEN, 0); - } + dev_dbg(dev, "[%u] release\n", id); - input_report_key(input_dev, BTN_STYLUS, (msg[2] & MXT_STYLUS_ERASER)); - input_report_key(input_dev, BTN_STYLUS2, (msg[2] & MXT_STYLUS_BARREL)); + /* close out slot */ + input_mt_report_slot_state(input_dev, 0, 0); + } - mxt_input_sync(data); + data->update_input = true; } -static int mxt_proc_message(struct mxt_data *data, u8 *msg) +static int mxt_proc_message(struct mxt_data *data, u8 *message) { - u8 report_id = msg[0]; + u8 report_id = message[0]; if (report_id == MXT_RPTID_NOMSG) - return -1; - - if (data->debug_enabled) - print_hex_dump(KERN_DEBUG, "MXT MSG:", DUMP_PREFIX_NONE, 16, 1, - msg, data->T5_msg_size, false); - - if (report_id >= data->T9_reportid_min - && report_id <= data->T9_reportid_max) { - mxt_proc_t9_messages(data, msg); - } else if (report_id >= data->T63_reportid_min - && report_id <= data->T63_reportid_max) { - mxt_proc_t63_messages(data, msg); - } else if (report_id >= data->T15_reportid_min - && report_id <= data->T15_reportid_max) { - mxt_proc_t15_messages(data, msg); - } else if (report_id == data->T6_reportid) { - mxt_proc_t6_messages(data, msg); - } else if (report_id == data->T48_reportid) { - mxt_proc_t48_messages(data, msg); - } else if (report_id >= data->T42_reportid_min - && report_id <= data->T42_reportid_max) { - mxt_proc_t42_messages(data, msg); + return 0; + + if (report_id == data->T6_reportid) { + mxt_proc_t6_messages(data, message); + } else if (!data->input_dev) { + /* + * Do not report events if input device + * is not yet registered. + */ + mxt_dump_message(data, message); + } else if (report_id >= data->T9_reportid_min && + report_id <= data->T9_reportid_max) { + mxt_proc_t9_message(data, message); + } else if (report_id >= data->T100_reportid_min && + report_id <= data->T100_reportid_max) { + mxt_proc_t100_message(data, message); + } else if (report_id == data->T19_reportid) { + mxt_input_button(data, message); + data->update_input = true; + } else { + mxt_dump_message(data, message); } - return 0; + return 1; } -static int mxt_read_count_messages(struct mxt_data *data, u8 count) +static int mxt_read_and_process_messages(struct mxt_data *data, u8 count) { struct device *dev = &data->client->dev; int ret; @@ -1016,7 +983,7 @@ static int mxt_read_count_messages(struct mxt_data *data, u8 count) return -EINVAL; /* Process remaining messages if necessary */ - ret = mxt_read_reg(data->client, data->T5_address, + ret = __mxt_read_reg(data->client, data->T5_address, data->T5_msg_size * count, data->msg_buf); if (ret) { dev_err(dev, "Failed to read %u messages (%d)\n", count, ret); @@ -1027,7 +994,7 @@ static int mxt_read_count_messages(struct mxt_data *data, u8 count) ret = mxt_proc_message(data, data->msg_buf + data->T5_msg_size * i); - if (ret == 0) + if (ret == 1) num_valid++; } @@ -1035,14 +1002,14 @@ static int mxt_read_count_messages(struct mxt_data *data, u8 count) return num_valid; } -static irqreturn_t mxt_read_messages_t44(struct mxt_data *data) +static irqreturn_t mxt_process_messages_t44(struct mxt_data *data) { struct device *dev = &data->client->dev; int ret; u8 count, num_left; /* Read T44 and T5 together */ - ret = mxt_read_reg(data->client, data->T44_address, + ret = __mxt_read_reg(data->client, data->T44_address, data->T5_msg_size + 1, data->msg_buf); if (ret) { dev_err(dev, "Failed to read T44 and T5 (%d)\n", ret); @@ -1051,11 +1018,15 @@ static irqreturn_t mxt_read_messages_t44(struct mxt_data *data) count = data->msg_buf[0]; - if (count == 0) { - dev_warn(dev, "Interrupt triggered but zero messages\n"); + /* + * This condition may be caused by the CHG line being configured in + * Mode 0. It results in unnecessary I2C operations but it is benign. + */ + if (count == 0) return IRQ_NONE; - } else if (count > data->max_reportid) { - dev_err(dev, "T44 count exceeded max report id\n"); + + if (count > data->max_reportid) { + dev_warn(dev, "T44 count %d exceeded max report id\n", count); count = data->max_reportid; } @@ -1070,21 +1041,23 @@ static irqreturn_t mxt_read_messages_t44(struct mxt_data *data) /* Process remaining messages if necessary */ if (num_left) { - ret = mxt_read_count_messages(data, num_left); - if (ret < 0) { - mxt_input_sync(data); - return IRQ_NONE; - } else if (ret != num_left) { + ret = mxt_read_and_process_messages(data, num_left); + if (ret < 0) + goto end; + else if (ret != num_left) dev_warn(dev, "Unexpected invalid message\n"); - } } - mxt_input_sync(data); +end: + if (data->update_input) { + mxt_input_sync(data); + data->update_input = false; + } return IRQ_HANDLED; } -static int mxt_read_t9_messages_until_invalid(struct mxt_data *data) +static int mxt_process_messages_until_invalid(struct mxt_data *data) { struct device *dev = &data->client->dev; int count, read; @@ -1094,16 +1067,21 @@ static int mxt_read_t9_messages_until_invalid(struct mxt_data *data) /* Read messages until we force an invalid */ do { - read = mxt_read_count_messages(data, count); + read = mxt_read_and_process_messages(data, count); if (read < count) return 0; } while (--tries); + if (data->update_input) { + mxt_input_sync(data); + data->update_input = false; + } + dev_err(dev, "CHG pin isn't cleared\n"); return -EBUSY; } -static irqreturn_t mxt_read_t9_messages(struct mxt_data *data) +static irqreturn_t mxt_process_messages(struct mxt_data *data) { int total_handled, num_handled; u8 count = data->last_message_count; @@ -1112,17 +1090,16 @@ static irqreturn_t mxt_read_t9_messages(struct mxt_data *data) count = 1; /* include final invalid message */ - total_handled = mxt_read_count_messages(data, count + 1); + total_handled = mxt_read_and_process_messages(data, count + 1); if (total_handled < 0) return IRQ_NONE; /* if there were invalid messages, then we are done */ else if (total_handled <= count) goto update_count; - /* read two at a time until an invalid message or else we reach - * reportid limit */ + /* keep reading two msgs until one is invalid or reportid limit */ do { - num_handled = mxt_read_count_messages(data, 2); + num_handled = mxt_read_and_process_messages(data, 2); if (num_handled < 0) return IRQ_NONE; @@ -1134,171 +1111,180 @@ static irqreturn_t mxt_read_t9_messages(struct mxt_data *data) update_count: data->last_message_count = total_handled; - mxt_input_sync(data); + + if (data->update_input) { + mxt_input_sync(data); + data->update_input = false; + } + return IRQ_HANDLED; } static irqreturn_t mxt_interrupt(int irq, void *dev_id) { struct mxt_data *data = dev_id; - trace_touchscreen_atmel_irq("Atmel_mxt_interrupt"); - if (data->T44_address) - return mxt_read_messages_t44(data); - else - return mxt_read_t9_messages(data); + + if (data->in_bootloader) { + /* bootloader state transition completion */ + complete(&data->bl_completion); + return IRQ_HANDLED; + } + + if (!data->object_table) + return IRQ_HANDLED; + + if (data->T44_address) { + return mxt_process_messages_t44(data); + } else { + return mxt_process_messages(data); + } } -static void mxt_read_current_crc(struct mxt_data *data) +static int mxt_t6_command(struct mxt_data *data, u16 cmd_offset, + u8 value, bool wait) { - /* CRC has already been read */ - if (data->config_crc > 0) - return; + 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; + + do { + msleep(20); + ret = __mxt_read_reg(data->client, reg, 1, &command_register); + if (ret) + return ret; + } 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_acquire_irq(struct mxt_data *data) +{ + int error; + + enable_irq(data->irq); + + error = mxt_process_messages_until_invalid(data); + if (error) + return error; + + return 0; +} + +static int mxt_soft_reset(struct mxt_data *data) +{ + struct device *dev = &data->client->dev; + int ret = 0; + + dev_info(dev, "Resetting device\n"); + + disable_irq(data->irq); + + reinit_completion(&data->reset_completion); + + ret = mxt_t6_command(data, MXT_COMMAND_RESET, MXT_RESET_VALUE, false); + if (ret) + return ret; + + /* Ignore CHG line for 100ms after reset */ + msleep(100); + + mxt_acquire_irq(data); + + ret = mxt_wait_for_completion(data, &data->reset_completion, + MXT_RESET_TIMEOUT); + if (ret) + return ret; - mxt_write_object(data, MXT_GEN_COMMAND_T6, - MXT_COMMAND_REPORTALL, 1); + return 0; +} - msleep(30); +static void mxt_update_crc(struct mxt_data *data, u8 cmd, u8 value) +{ + /* + * On failure, CRC is set to 0 and config will always be + * downloaded. + */ + data->config_crc = 0; + reinit_completion(&data->crc_completion); - /* Read all messages until invalid, this will update the - config crc stored in mxt_data */ - mxt_read_t9_messages_until_invalid(data); + mxt_t6_command(data, cmd, value, true); - /* on failure, CRC is set to 0 and config will always be downloaded */ + /* + * 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 u32 mxt_calculate_crc32(u32 crc, u8 firstbyte, u8 secondbyte) +static void mxt_calc_crc24(u32 *crc, u8 firstbyte, u8 secondbyte) { static const unsigned int crcpoly = 0x80001B; u32 result; - u16 data_word; + u32 data_word; - data_word = (u16)((u16)(secondbyte << 8) | firstbyte); - result = ((crc << 1) ^ (u32)data_word); + data_word = (secondbyte << 8) | firstbyte; + result = ((*crc << 1) ^ data_word); - /* if bit 25 is set, XOR with crcpoly */ - if (result & 0x1000000) { + if (result & 0x1000000) result ^= crcpoly; - } - return result; + *crc = result; } -static u32 mxt_calculate_config_crc(u8 *base, off_t start_off, off_t end_off) +static u32 mxt_calculate_crc(u8 *base, off_t start_off, off_t end_off) { - u8 *i; u32 crc = 0; + u8 *ptr = base + start_off; u8 *last_val = base + end_off - 1; if (end_off < start_off) return -EINVAL; - for (i = base + start_off; i < last_val; i += 2) { - crc = mxt_calculate_crc32(crc, *i, *(i + 1)); + while (ptr < last_val) { + mxt_calc_crc24(&crc, *ptr, *(ptr + 1)); + ptr += 2; } /* if len is odd, fill the last byte with 0 */ - if (i == last_val) - crc = mxt_calculate_crc32(crc, *i, 0); + if (ptr == last_val) + mxt_calc_crc24(&crc, *ptr, 0); /* Mask to 24-bit */ - return (crc & 0x00FFFFFF); + crc &= 0x00FFFFFF; + + return crc; } -int mxt_download_config(struct mxt_data *data, const char *fn) +static int mxt_prepare_cfg_mem(struct mxt_data *data, + const struct firmware *cfg, + unsigned int data_pos, + unsigned int cfg_start_ofs, + u8 *config_mem, + size_t config_mem_size) { struct device *dev = &data->client->dev; - struct mxt_info cfg_info; struct mxt_object *object; - const struct firmware *cfg = NULL; - int ret; + unsigned int type, instance, size, byte_offset; int offset; - int data_pos; - int byte_offset; + int ret; int i; - int config_start_offset; - u32 info_crc, config_crc, calculated_crc; - u8 *config_mem; - size_t config_mem_size; - unsigned int type, instance, size; - u8 val; u16 reg; - - ret = request_firmware(&cfg, fn, dev); - if (ret < 0) { - dev_err(dev, "Failure to request config file %s\n", fn); - return 0; - } - - mxt_read_current_crc(data); - - 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; - } - - /* Read CRCs */ - ret = sscanf(cfg->data + data_pos, "%x%n", &info_crc, &offset); - if (ret != 1) { - dev_err(dev, "Bad format\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\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_block_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_info(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, "Info block CRC mismatch - attempting to apply config\n"); - } - - /* Malloc memory to store configuration */ - config_start_offset = MXT_OBJECT_START - + data->info.object_num * MXT_OBJECT_SIZE; - config_mem_size = data->mem_size - config_start_offset; - config_mem = kzalloc(config_mem_size, GFP_KERNEL); - if (!config_mem) { - dev_err(dev, "Failed to allocate memory\n"); - ret = -ENOMEM; - goto release; - } + u8 val; while (data_pos < cfg->size) { /* Read type, instance, length */ @@ -1308,1068 +1294,1576 @@ int mxt_download_config(struct mxt_data *data, const char *fn) /* EOF */ break; } else if (ret != 3) { - dev_err(dev, "Bad format\n"); - ret = -EINVAL; - goto release_mem; + dev_err(dev, "Bad format: failed to parse object\n"); + return -EINVAL; } data_pos += offset; object = mxt_get_object(data, type); if (!object) { - ret = -EINVAL; - goto release_mem; - } - - if (instance >= object->instances) { - dev_err(dev, "Object instances exceeded!\n"); - ret = -EINVAL; - goto release_mem; + /* Skip object */ + 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 at %d\n", + type, i); + return -EINVAL; + } + data_pos += offset; + } + continue; } - reg = object->start_address + object->size * instance; - - if (size > object->size) { - /* Either we are in fallback mode due to wrong + 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 %u bytes in T%u!\n", - size - object->size, type); - - size = object->size; - } else if (object->size > size) { - /* If firmware is upgraded, new bytes may be added to + * 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 %d byte(s) in T%d\n", - object->size - size, type); + * 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"); + return -EINVAL; } + 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\n"); - ret = -EINVAL; - goto release_mem; + dev_err(dev, "Bad format in T%d at %d\n", + type, i); + return -EINVAL; } + data_pos += offset; - byte_offset = reg + i - config_start_offset; + if (i > mxt_obj_size(object)) + continue; - if ((byte_offset >= 0) - && (byte_offset <= config_mem_size)) { + 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; + return -EINVAL; } - - data_pos += offset; } - - } - - /* calculate crc of the received configs (not the raw config file) */ - if (data->T7_address < config_start_offset) { - dev_err(dev, "Bad T7 address, T7addr = %x, config offset %x\n", - data->T7_address, config_start_offset); - ret = 0; - goto release_mem; } - calculated_crc = mxt_calculate_config_crc(config_mem, - data->T7_address - config_start_offset, config_mem_size); + return 0; +} - /* check the crc, calculated should same as what's in file */ - if (config_crc > 0 && (config_crc != calculated_crc)) { - dev_err(dev, "CRC mismatch in config file, calculated=%06X, file=%06X\n", - calculated_crc, config_crc); - ret = 0; - goto release_mem; - } +static int mxt_upload_cfg_mem(struct mxt_data *data, unsigned int cfg_start, + u8 *config_mem, size_t config_mem_size) +{ + unsigned int byte_offset = 0; + int error; /* Write configuration as blocks */ - byte_offset = 0; while (byte_offset < config_mem_size) { - size = config_mem_size - byte_offset; + unsigned int size = config_mem_size - byte_offset; if (size > MXT_MAX_BLOCK_WRITE) size = MXT_MAX_BLOCK_WRITE; - ret = mxt_write_block(data->client, - config_start_offset + byte_offset, - size, config_mem + byte_offset); - if (ret != 0) { - dev_err(dev, "Config write error, ret=%d\n", ret); - goto release_mem; + error = __mxt_write_reg(data->client, + cfg_start + byte_offset, + size, config_mem + byte_offset); + if (error) { + dev_err(&data->client->dev, + "Config write error, ret=%d\n", error); + return error; } byte_offset += size; } - ret = 1; /* tell the caller config has been sent */ - -release_mem: - kfree(config_mem); -release: - release_firmware(cfg); - return ret; + return 0; } -static int mxt_set_power_cfg(struct mxt_data *data, u8 mode) +static int mxt_init_t7_power_cfg(struct mxt_data *data); + +/* + * 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: + * + * + * - 2-byte object type as hex + * - 2-byte object instance number as hex + * - 2-byte object size as hex + * - array of 1-byte hex values + */ +static int mxt_update_cfg(struct mxt_data *data, const struct firmware *cfg) { struct device *dev = &data->client->dev; - int error = 0; - int i, cnt; + struct mxt_info cfg_info; + int ret; + int offset; + int data_pos; + int i; + int cfg_start_ofs; + u32 info_crc, config_crc, calculated_crc; + u8 *config_mem; + size_t config_mem_size; + + mxt_update_crc(data, MXT_COMMAND_REPORTALL, 1); - if (data->state != APPMODE) { - dev_err(dev, "Not in APPMODE\n"); + if (strncmp(cfg->data, MXT_CFG_MAGIC, strlen(MXT_CFG_MAGIC))) { + dev_err(dev, "Unrecognised config file\n"); return -EINVAL; } - switch (mode) { - case MXT_POWER_CFG_DEEPSLEEP: - /* Touch disable */ - cnt = ARRAY_SIZE(mxt_save); - for (i = 0; i < cnt; i++) { - if (mxt_save[i].suspend_flags == MXT_SUSPEND_DYNAMIC) - error |= mxt_read_object(data, - mxt_save[i].suspend_obj, - mxt_save[i].suspend_reg, - &mxt_save[i].restore_val); - error |= mxt_write_object(data, - mxt_save[i].suspend_obj, - mxt_save[i].suspend_reg, - mxt_save[i].suspend_val); + 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"); + return -EINVAL; } - break; - case MXT_POWER_CFG_RUN: - default: - /* Touch enable */ - cnt = ARRAY_SIZE(mxt_save); - while (cnt--) - error |= mxt_write_object(data, - mxt_save[cnt].suspend_obj, - mxt_save[cnt].suspend_reg, - mxt_save[cnt].restore_val); - break; + data_pos += offset; } - if (error) - goto i2c_error; - - data->is_stopped = (mode == MXT_POWER_CFG_DEEPSLEEP) ? 1 : 0; + if (cfg_info.family_id != data->info.family_id) { + dev_err(dev, "Family ID mismatch!\n"); + return -EINVAL; + } - return 0; + if (cfg_info.variant_id != data->info.variant_id) { + dev_err(dev, "Variant ID mismatch!\n"); + return -EINVAL; + } -i2c_error: - dev_err(dev, "Failed to set power cfg\n"); - return error; -} + /* 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"); + return -EINVAL; + } + data_pos += offset; -static int mxt_read_power_cfg(struct mxt_data *data, u8 *actv_cycle_time, - u8 *idle_cycle_time, u8 *actv2idle_timeout) -{ - int error; + 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"); + return -EINVAL; + } + data_pos += offset; - error = mxt_read_object(data, MXT_GEN_POWER_T7, - MXT_POWER_ACTVACQINT, - actv_cycle_time); - if (error) - return error; + /* + * 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); + return 0; + } 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); + } - error = mxt_read_object(data, MXT_GEN_POWER_T7, - MXT_POWER_IDLEACQINT, - idle_cycle_time); - if (error) - return error; + /* 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"); + return -ENOMEM; + } - error = mxt_read_object(data, MXT_GEN_POWER_T7, - MXT_POWER_ACTV2IDLETO, - actv2idle_timeout); - if (error) - return error; + ret = mxt_prepare_cfg_mem(data, cfg, data_pos, cfg_start_ofs, + config_mem, config_mem_size); + if (ret) + goto release_mem; - return 0; -} + /* 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; + } -static int mxt_check_power_cfg_post_reset(struct mxt_data *data) -{ - struct device *dev = &data->client->dev; - int error; + calculated_crc = mxt_calculate_crc(config_mem, + data->T7_address - cfg_start_ofs, + config_mem_size); - error = mxt_read_power_cfg(data, &data->actv_cycle_time, - &data->idle_cycle_time, - &data->actv2idle_timeout); - if (error) - return error; + if (config_crc > 0 && config_crc != calculated_crc) + dev_warn(dev, "Config CRC error, calculated=%06X, file=%06X\n", + calculated_crc, config_crc); - /* Power config is zero, select free run */ - if (data->actv_cycle_time == 0 || data->idle_cycle_time == 0) { - dev_dbg(dev, "Overriding power cfg to free run\n"); - data->actv_cycle_time = 255; - data->idle_cycle_time = 255; + ret = mxt_upload_cfg_mem(data, cfg_start_ofs, + config_mem, config_mem_size); + if (ret) + goto release_mem; - error = mxt_set_power_cfg(data, MXT_POWER_CFG_RUN); - if (error) - return error; - } + mxt_update_crc(data, MXT_COMMAND_BACKUPNV, MXT_BACKUP_VALUE); - return 0; + ret = mxt_soft_reset(data); + if (ret) + goto release_mem; + + dev_info(dev, "Config successfully updated\n"); + + /* T7 config may have changed */ + mxt_init_t7_power_cfg(data); + +release_mem: + kfree(config_mem); + return ret; } -static int mxt_probe_power_cfg(struct mxt_data *data) +static int mxt_get_info(struct mxt_data *data) { + struct i2c_client *client = data->client; + struct mxt_info *info = &data->info; int error; - data->slowscan_actv_cycle_time = 120; /* 120mS */ - data->slowscan_idle_cycle_time = 10; /* 10mS */ - data->slowscan_actv2idle_timeout = 100; /* 10 seconds */ - - error = mxt_read_power_cfg(data, &data->actv_cycle_time, - &data->idle_cycle_time, - &data->actv2idle_timeout); + /* Read 7-byte info block starting at address 0 */ + error = __mxt_read_reg(client, 0, sizeof(*info), info); if (error) return error; - /* If in deep sleep mode, attempt reset */ - if (data->actv_cycle_time == 0 || data->idle_cycle_time == 0) { - error = mxt_soft_reset(data, MXT_RESET_VALUE); - if (error) - return error; - - error = mxt_check_power_cfg_post_reset(data); - if (error) - return error; - } - return 0; } -static int mxt_check_reg_init(struct mxt_data *data) +static void mxt_free_input_device(struct mxt_data *data) { - struct device *dev = &data->client->dev; - int timeout_counter = 0; - int ret; - u8 command_register; - - ret = mxt_download_config(data, data->pdata->mxt_cfg_name); - if (ret < 0) - return ret; - else if (ret == 0) - /* CRC matched, or no config file, or config parse failure - * - no need to reset */ - return 0; - - /* Backup to memory */ - mxt_write_object(data, MXT_GEN_COMMAND_T6, - MXT_COMMAND_BACKUPNV, - MXT_BACKUP_VALUE); - msleep(MXT_BACKUP_TIME); - do { - ret = mxt_read_object(data, MXT_GEN_COMMAND_T6, - MXT_COMMAND_BACKUPNV, - &command_register); - if (ret) - return ret; - msleep(20); - } while ((command_register != 0) && (timeout_counter++ <= 100)); - if (timeout_counter > 100) { - dev_err(dev, "No response after backup!\n"); - return -EIO; + if (data->input_dev) { + input_unregister_device(data->input_dev); + data->input_dev = NULL; } - - ret = mxt_soft_reset(data, MXT_RESET_VALUE); - if (ret) - return ret; - - ret = mxt_check_power_cfg_post_reset(data); - if (ret) - return ret; - - return 0; } -static int mxt_read_info_block_crc(struct mxt_data *data) +static void mxt_free_object_table(struct mxt_data *data) { - int ret; - u16 offset; - u8 buf[3]; - - offset = MXT_OBJECT_START + MXT_OBJECT_SIZE * data->info.object_num; - - ret = mxt_read_reg(data->client, offset, sizeof(buf), buf); - if (ret) - return ret; - - data->info_block_crc = (buf[2] << 16) | (buf[1] << 8) | buf[0]; +#ifdef CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 + video_unregister_device(&data->dbg.vdev); + v4l2_device_unregister(&data->dbg.v4l2); +#endif - return 0; + kfree(data->object_table); + data->object_table = NULL; + kfree(data->msg_buf); + data->msg_buf = NULL; + data->T5_address = 0; + 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; + data->T44_address = 0; + data->T100_reportid_min = 0; + data->T100_reportid_max = 0; + data->max_reportid = 0; } static int mxt_get_object_table(struct mxt_data *data) { struct i2c_client *client = data->client; - struct device *dev = &data->client->dev; - int ret; + size_t table_size; + struct mxt_object *object_table; + int error; int i; + u8 reportid; u16 end_address; - u8 reportid = 0; - u8 buf[data->info.object_num][MXT_OBJECT_SIZE]; - data->mem_size = 0; - data->object_table = kcalloc(data->info.object_num, - sizeof(struct mxt_object), GFP_KERNEL); - if (!data->object_table) { - dev_err(dev, "Failed to allocate object table\n"); + 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; } - ret = mxt_read_reg(client, MXT_OBJECT_START, sizeof(buf), buf); - if (ret) - goto free_object_table; + 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 = data->object_table + i; + struct mxt_object *object = object_table + i; + u8 min_id, max_id; - object->type = buf[i][0]; - object->start_address = (buf[i][2] << 8) | buf[i][1]; - object->size = buf[i][3] + 1; - object->instances = buf[i][4] + 1; - object->num_report_ids = buf[i][5]; + le16_to_cpus(&object->start_address); if (object->num_report_ids) { - reportid += object->num_report_ids * object->instances; - object->max_reportid = reportid; - object->min_reportid = object->max_reportid - - object->instances * object->num_report_ids + 1; + min_id = reportid; + reportid += object->num_report_ids * + mxt_obj_instances(object); + max_id = reportid - 1; + } else { + min_id = 0; + max_id = 0; } - end_address = object->start_address - + object->size * object->instances - 1; - - if (end_address >= data->mem_size) - data->mem_size = end_address + 1; + 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); - /* save data for objects used when processing interrupts */ switch (object->type) { - case MXT_TOUCH_MULTI_T9: - data->T9_reportid_max = object->max_reportid; - data->T9_reportid_min = object->min_reportid; - data->num_touchids = object->num_report_ids * object->instances; - break; - case MXT_GEN_COMMAND_T6: - data->T6_reportid = object->max_reportid; - break; case MXT_GEN_MESSAGE_T5: - if (data->info.family_id == 0x80) { - /* On mXT224 must read and discard CRC byte - * otherwise DMA reads are misaligned */ - data->T5_msg_size = object->size; + if (data->info.family_id == 0x80 && + data->info.version < 0x20) { + /* + * On mXT224 firmware versions prior to V2.0 + * read and discard unused CRC byte otherwise + * DMA reads are misaligned. + */ + data->T5_msg_size = mxt_obj_size(object); } else { - /* CRC not enabled, therefore don't read last byte */ - data->T5_msg_size = object->size - 1; + /* CRC not enabled, so skip last byte */ + data->T5_msg_size = mxt_obj_size(object) - 1; } data->T5_address = object->start_address; break; + 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_KEYARRAY_T15: - data->T15_reportid_max = object->max_reportid; - data->T15_reportid_min = object->min_reportid; - break; - case MXT_PROCI_TOUCHSUPPRESSION_T42: - data->T42_reportid_max = object->max_reportid; - data->T42_reportid_min = object->min_reportid; + case MXT_TOUCH_MULTI_T9: + data->multitouch = MXT_TOUCH_MULTI_T9; + data->T9_reportid_min = min_id; + data->T9_reportid_max = max_id; + data->num_touchids = object->num_report_ids + * mxt_obj_instances(object); break; case MXT_SPT_MESSAGECOUNT_T44: data->T44_address = object->start_address; break; - case MXT_SPT_NOISESUPPRESSION_T48: - data->T48_reportid = object->max_reportid; + case MXT_SPT_GPIOPWM_T19: + data->T19_reportid = min_id; break; - case MXT_PROCI_ACTIVE_STYLUS_T63: - data->T63_reportid_max = object->max_reportid; - data->T63_reportid_min = object->min_reportid; - data->num_stylusids = - object->num_report_ids * object->instances; + case MXT_TOUCH_MULTITOUCHSCREEN_T100: + data->multitouch = MXT_TOUCH_MULTITOUCHSCREEN_T100; + data->T100_reportid_min = min_id; + data->T100_reportid_max = max_id; + /* first two report IDs reserved */ + data->num_touchids = object->num_report_ids - 2; break; } - dev_dbg(dev, "T%u, start:%u size:%u instances:%u " - "min_reportid:%u max_reportid:%u\n", - object->type, object->start_address, object->size, - object->instances, - object->min_reportid, object->max_reportid); + 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; } /* Store maximum reportid */ data->max_reportid = reportid; - /* If T44 exists, T9 position has to be directly after */ + /* If T44 exists, T5 position has to be directly after */ if (data->T44_address && (data->T5_address != data->T44_address + 1)) { - dev_err(dev, "Invalid T44 position\n"); - ret = -EINVAL; + dev_err(&client->dev, "Invalid T44 position\n"); + error = -EINVAL; goto free_object_table; } - /* Allocate message buffer */ - data->msg_buf = kcalloc(data->max_reportid, data->T5_msg_size, GFP_KERNEL); + data->msg_buf = kcalloc(data->max_reportid, + data->T5_msg_size, GFP_KERNEL); if (!data->msg_buf) { - dev_err(dev, "Failed to allocate message buffer\n"); - ret = -ENOMEM; + 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: - kfree(data->object_table); - return ret; + mxt_free_object_table(data); + return error; } -static int mxt_read_resolution(struct mxt_data *data) +static int mxt_read_t9_resolution(struct mxt_data *data) { struct i2c_client *client = data->client; int error; - unsigned int x_range, y_range; + struct t9_range range; unsigned char orient; - unsigned char val; + struct mxt_object *object; - /* Update matrix size in info struct */ - error = mxt_read_reg(client, MXT_MATRIX_X_SIZE, 1, &val); + object = mxt_get_object(data, MXT_TOUCH_MULTI_T9); + if (!object) + return -EINVAL; + + error = __mxt_read_reg(client, + object->start_address + MXT_T9_XSIZE, + sizeof(data->xsize), &data->xsize); + if (error) + return error; + + error = __mxt_read_reg(client, + object->start_address + MXT_T9_YSIZE, + sizeof(data->ysize), &data->ysize); + if (error) + return error; + + error = __mxt_read_reg(client, + object->start_address + MXT_T9_RANGE, + sizeof(range), &range); + if (error) + return error; + + data->max_x = get_unaligned_le16(&range.x); + data->max_y = get_unaligned_le16(&range.y); + + error = __mxt_read_reg(client, + object->start_address + MXT_T9_ORIENT, + 1, &orient); if (error) return error; - data->info.matrix_xsize = val; - error = mxt_read_reg(client, MXT_MATRIX_Y_SIZE, 1, &val); + data->xy_switch = orient & MXT_T9_ORIENT_SWITCH; + data->invertx = orient & MXT_T9_ORIENT_INVERTX; + data->inverty = orient & MXT_T9_ORIENT_INVERTY; + + return 0; +} + +static int mxt_read_t100_config(struct mxt_data *data) +{ + struct i2c_client *client = data->client; + int error; + struct mxt_object *object; + u16 range_x, range_y; + u8 cfg, tchaux; + u8 aux; + + object = mxt_get_object(data, MXT_TOUCH_MULTITOUCHSCREEN_T100); + if (!object) + return -EINVAL; + + /* read touchscreen dimensions */ + error = __mxt_read_reg(client, + object->start_address + MXT_T100_XRANGE, + sizeof(range_x), &range_x); if (error) return error; - data->info.matrix_ysize = val; - /* Read X/Y size of touchscreen */ - error = mxt_read_object(data, MXT_TOUCH_MULTI_T9, - MXT_TOUCH_XRANGE_MSB, &val); + data->max_x = get_unaligned_le16(&range_x); + + error = __mxt_read_reg(client, + object->start_address + MXT_T100_YRANGE, + sizeof(range_y), &range_y); if (error) return error; - x_range = val << 8; - error = mxt_read_object(data, MXT_TOUCH_MULTI_T9, - MXT_TOUCH_XRANGE_LSB, &val); + data->max_y = get_unaligned_le16(&range_y); + + error = __mxt_read_reg(client, + object->start_address + MXT_T100_XSIZE, + sizeof(data->xsize), &data->xsize); if (error) return error; - x_range |= val; - error = mxt_read_object(data, MXT_TOUCH_MULTI_T9, - MXT_TOUCH_YRANGE_MSB, &val); + error = __mxt_read_reg(client, + object->start_address + MXT_T100_YSIZE, + sizeof(data->ysize), &data->ysize); if (error) return error; - y_range = val << 8; - error = mxt_read_object(data, MXT_TOUCH_MULTI_T9, - MXT_TOUCH_YRANGE_LSB, &val); + /* read orientation config */ + error = __mxt_read_reg(client, + object->start_address + MXT_T100_CFG1, + 1, &cfg); if (error) return error; - y_range |= val; - error = mxt_read_object(data, MXT_TOUCH_MULTI_T9, - MXT_TOUCH_ORIENT, &orient); + data->xy_switch = cfg & MXT_T100_CFG_SWITCHXY; + data->invertx = cfg & MXT_T100_CFG_INVERTX; + data->inverty = cfg & MXT_T100_CFG_INVERTY; + + /* allocate aux bytes */ + error = __mxt_read_reg(client, + object->start_address + MXT_T100_TCHAUX, + 1, &tchaux); if (error) return error; - /* Handle default values */ - if (x_range == 0) - x_range = 1023; + aux = 6; - if (y_range == 0) - y_range = 1023; + if (tchaux & MXT_T100_TCHAUX_VECT) + data->t100_aux_vect = aux++; - if (orient & MXT_XY_SWITCH) { - data->max_x = y_range; - data->max_y = x_range; - } else { - data->max_x = x_range; - data->max_y = y_range; - } + if (tchaux & MXT_T100_TCHAUX_AMPL) + data->t100_aux_ampl = aux++; - dev_info(&client->dev, - "Matrix Size X%uY%u Touchscreen size X%uY%u\n", - data->info.matrix_xsize, data->info.matrix_ysize, - data->max_x, data->max_y); + if (tchaux & MXT_T100_TCHAUX_AREA) + data->t100_aux_area = aux++; + + dev_dbg(&client->dev, + "T100 aux mappings vect:%u ampl:%u area:%u\n", + data->t100_aux_vect, data->t100_aux_ampl, data->t100_aux_area); return 0; } -static void mxt_initialize_regulator(struct mxt_data *data) +static int mxt_input_open(struct input_dev *dev); +static void mxt_input_close(struct input_dev *dev); + +static void mxt_set_up_as_touchpad(struct input_dev *input_dev, + struct mxt_data *data) { - int ret; - struct i2c_client *client = data->client; + const struct mxt_platform_data *pdata = data->pdata; + int i; - /* - Vdd and AVdd can be powered up in any order - XVdd must not be powered up until after Vdd - and must obey the rate-of-rise specification - */ - - data->regulator_vdd = devm_regulator_get(&client->dev, "vdd"); - if (IS_ERR(data->regulator_vdd)) { - dev_info(&client->dev, - "Atmel regulator_get for vdd failed: %ld\n", - PTR_ERR(data->regulator_vdd)); - goto err_null_regulator; - } - - data->regulator_avdd = devm_regulator_get(&client->dev, "avdd"); - if (IS_ERR(data->regulator_avdd)) { - dev_info(&client->dev, - "Atmel regulator_get for avdd failed: %ld\n", - PTR_ERR(data->regulator_avdd)); - goto err_put_regulator; - } - - dev_info(&client->dev, - "Atmel regulator_get for vdd and avdd succeeded\n"); - - ret = regulator_enable(data->regulator_vdd); - if (ret < 0) - dev_err(&client->dev, - "Atmel regulator_enable for vdd failed; Error code:%d\n", ret); - - ret = regulator_enable(data->regulator_avdd); - if (ret < 0) - dev_err(&client->dev, - "Atmel regulator_enable for avdd failed; Error code:%d\n", ret); - return; + input_dev->name = "Atmel maXTouch Touchpad"; + + __set_bit(INPUT_PROP_BUTTONPAD, input_dev->propbit); -err_put_regulator: - devm_regulator_put(data->regulator_vdd); -err_null_regulator: - data->regulator_avdd = NULL; - data->regulator_vdd = NULL; + 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); + + 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]); } -static int mxt_initialize(struct mxt_data *data) +static int mxt_initialize_input_device(struct mxt_data *data) { - struct i2c_client *client = data->client; - struct mxt_info *info = &data->info; + const struct mxt_platform_data *pdata = data->pdata; + struct device *dev = &data->client->dev; + struct input_dev *input_dev; int error; - u8 retry_count = 0; + unsigned int num_mt_slots; + unsigned int mt_flags = 0; -retry_probe: - /* Read info block */ - error = mxt_read_reg(client, 0, sizeof(*info), info); - if (error) { - error = mxt_probe_bootloader(data); - if (error) { - /* Chip is not in appmode or bootloader mode */ - return error; - } else { - if (++retry_count > 10) { - dev_err(&client->dev, - "Could not recover device from " - "bootloader mode\n"); - data->state = BOOTLOADER; - /* this is not an error state, we can reflash - * from here */ - return 0; - } + switch (data->multitouch) { + case MXT_TOUCH_MULTI_T9: + num_mt_slots = data->T9_reportid_max - data->T9_reportid_min + 1; + error = mxt_read_t9_resolution(data); + if (error) + dev_warn(dev, "Failed to initialize T9 resolution\n"); + break; - /* Tell bootloader to enter app mode. Ignore errors - * since we're in a retry loop */ - mxt_send_bootloader_cmd(data, false); - msleep(MXT_FWRESET_TIME); - goto retry_probe; - } + case MXT_TOUCH_MULTITOUCHSCREEN_T100: + num_mt_slots = data->num_touchids; + error = mxt_read_t100_config(data); + if (error) + dev_warn(dev, "Failed to read T100 config\n"); + break; + + default: + dev_err(dev, "Invalid multitouch object\n"); + return -EINVAL; } - dev_info(&client->dev, - "Family ID: %d Variant ID: %d Version: %d.%d.%02X " - "Object Num: %d\n", - info->family_id, info->variant_id, - info->version >> 4, info->version & 0xf, - info->build, info->object_num); + /* Handle default values and orientation switch */ + if (data->max_x == 0) + data->max_x = 1023; - data->state = APPMODE; + if (data->max_y == 0) + data->max_y = 1023; - /* 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; - } + if (data->xy_switch) + swap(data->max_x, data->max_y); - /* Read information block CRC */ - error = mxt_read_info_block_crc(data); - if (error) { - dev_err(&client->dev, "Error %d reading info block CRC\n", error); + dev_info(dev, "Touchscreen size X%uY%u\n", data->max_x, data->max_y); + + /* Register input device */ + input_dev = input_allocate_device(); + if (!input_dev) { + dev_err(dev, "Failed to allocate memory\n"); + return -ENOMEM; } - error = mxt_probe_power_cfg(data); - if (error) { - dev_err(&client->dev, "Failed to initialize power cfg\n"); - return error; + 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; + + input_set_capability(input_dev, EV_KEY, BTN_TOUCH); + input_set_capability(input_dev, EV_ABS, 0); + + /* 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); + + if (data->multitouch == MXT_TOUCH_MULTI_T9 || + (data->multitouch == MXT_TOUCH_MULTITOUCHSCREEN_T100 && + data->t100_aux_ampl)) { + input_set_abs_params(input_dev, ABS_PRESSURE, 0, 255, 0, 0); } - /* Check register init values */ - error = mxt_check_reg_init(data); - if (error) { - dev_err(&client->dev, "Failed to initialize config\n"); - return error; + /* If device has buttons we assume it is a touchpad */ + if (pdata->t19_num_keys) { + mxt_set_up_as_touchpad(input_dev, data); + mt_flags |= INPUT_MT_POINTER; + } else { + mt_flags |= INPUT_MT_DIRECT; } - error = mxt_read_resolution(data); + /* For multi touch */ + error = input_mt_init_slots(input_dev, num_mt_slots, mt_flags); if (error) { - dev_err(&client->dev, "Failed to initialize screen size\n"); - return error; + dev_err(dev, "Error %d initialising slots\n", error); + goto err_free_mem; } - return 0; -} + if (data->multitouch == MXT_TOUCH_MULTITOUCHSCREEN_T100) { + input_set_abs_params(input_dev, ABS_MT_TOOL_TYPE, + 0, MT_TOOL_MAX, 0, 0); + input_set_abs_params(input_dev, ABS_MT_DISTANCE, + MXT_DISTANCE_ACTIVE_TOUCH, + MXT_DISTANCE_HOVERING, + 0, 0); + } -static int mxt_check_firmware_format(struct device *dev, const struct firmware *fw) -{ - unsigned int pos = 0; - char c; + 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); - while (pos < fw->size) { - c = *(fw->data + pos); + if (data->multitouch == MXT_TOUCH_MULTI_T9 || + (data->multitouch == MXT_TOUCH_MULTITOUCHSCREEN_T100 && + data->t100_aux_area)) { + input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR, + 0, MXT_MAX_AREA, 0, 0); + } - if (c < '0' || (c > '9' && c < 'A') || c > 'F') - return 0; + if (data->multitouch == MXT_TOUCH_MULTI_T9 || + (data->multitouch == MXT_TOUCH_MULTITOUCHSCREEN_T100 && + data->t100_aux_ampl)) { + input_set_abs_params(input_dev, ABS_MT_PRESSURE, + 0, 255, 0, 0); + } - pos++; + if (data->multitouch == MXT_TOUCH_MULTITOUCHSCREEN_T100 && + data->t100_aux_vect) { + input_set_abs_params(input_dev, ABS_MT_ORIENTATION, + 0, 255, 0, 0); } - /* 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"); + if (data->multitouch == MXT_TOUCH_MULTITOUCHSCREEN_T100 && + data->t100_aux_ampl) { + input_set_abs_params(input_dev, ABS_MT_PRESSURE, + 0, 255, 0, 0); + } - return -1; -} + if (data->multitouch == MXT_TOUCH_MULTITOUCHSCREEN_T100 && + data->t100_aux_vect) { + input_set_abs_params(input_dev, ABS_MT_ORIENTATION, + 0, 255, 0, 0); + } -static int mxt_load_fw(struct device *dev, const char *fn) -{ - struct mxt_data *data = dev_get_drvdata(dev); - const struct firmware *fw = NULL; - unsigned int frame_size; - unsigned int pos = 0; - unsigned int retry = 0; - unsigned int frame = 0; - int ret; + input_set_drvdata(input_dev, data); - ret = request_firmware(&fw, fn, dev); - if (ret < 0) { - dev_err(dev, "Unable to open firmware %s\n", fn); - return ret; + error = input_register_device(input_dev); + if (error) { + dev_err(dev, "Error %d registering input device\n", error); + goto err_free_mem; } - /* Check for incorrect enc file */ - ret = mxt_check_firmware_format(dev, fw); - if (ret) - goto release_firmware; + data->input_dev = input_dev; - if (data->state != BOOTLOADER) { - /* Change to the bootloader mode */ - ret = mxt_soft_reset(data, MXT_BOOT_VALUE); - if (ret) - goto release_firmware; + return 0; - ret = mxt_get_bootloader_address(data); - if (ret) - goto release_firmware; +err_free_mem: + input_free_device(input_dev); + return error; +} - data->state = BOOTLOADER; - } +static int mxt_configure_objects(struct mxt_data *data, + const struct firmware *cfg); - ret = mxt_check_bootloader(data, MXT_WAITING_BOOTLOAD_CMD); - if (ret) { - mxt_wait_for_chg(data); - /* Bootloader may still be unlocked from previous update - * attempt */ - ret = mxt_check_bootloader(data, MXT_WAITING_FRAME_DATA); - if (ret) { - data->state = FAILED; - goto release_firmware; +static void mxt_config_cb(const struct firmware *cfg, void *ctx) +{ + mxt_configure_objects(ctx, cfg); + release_firmware(cfg); +} + +static int mxt_initialize(struct mxt_data *data) +{ + struct i2c_client *client = data->client; + int recovery_attempts = 0; + int error; + + while (1) { + error = mxt_get_info(data); + if (!error) + break; + + /* Check bootloader state */ + error = mxt_probe_bootloader(data, false); + if (error) { + dev_info(&client->dev, "Trying alternate bootloader address\n"); + error = mxt_probe_bootloader(data, true); + if (error) { + /* Chip is not in appmode or bootloader mode */ + return error; + } } - } else { - dev_info(dev, "Unlocking bootloader\n"); - /* Unlock bootloader */ - ret = mxt_send_bootloader_cmd(data, true); - if (ret) { - data->state = FAILED; - goto release_firmware; + /* OK, we are in bootloader, see if we can recover */ + if (++recovery_attempts > 1) { + dev_err(&client->dev, "Could not recover from bootloader mode\n"); + /* + * We can reflash from this state, so do not + * abort initialization. + */ + data->in_bootloader = true; + return 0; } + + /* Attempt to exit bootloader into app mode */ + mxt_send_bootloader_cmd(data, false); + msleep(MXT_FW_RESET_TIME); } - while (pos < fw->size) { - mxt_wait_for_chg(data); - ret = mxt_check_bootloader(data, MXT_WAITING_FRAME_DATA); - if (ret) { - data->state = FAILED; - goto release_firmware; - } + /* 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; + } - frame_size = ((*(fw->data + pos) << 8) | *(fw->data + pos + 1)); + error = mxt_acquire_irq(data); + if (error) + goto err_free_object_table; - /* Take account of CRC bytes */ - frame_size += 2; + error = request_firmware_nowait(THIS_MODULE, true, MXT_CFG_NAME, + &client->dev, GFP_KERNEL, data, + mxt_config_cb); + if (error) { + dev_err(&client->dev, "Failed to invoke firmware loader: %d\n", + error); + goto err_free_object_table; + } - /* Write one frame to device */ - ret = mxt_bootloader_write(data, fw->data + pos, frame_size); - if (ret) { - data->state = FAILED; - goto release_firmware; - } + return 0; - mxt_wait_for_chg(data); - ret = mxt_check_bootloader(data, MXT_FRAME_CRC_PASS); - if (ret) { - retry++; +err_free_object_table: + mxt_free_object_table(data); + return error; +} - /* Back off by 20ms per retry */ - msleep(retry * 20); +static int mxt_set_t7_power_cfg(struct mxt_data *data, u8 sleep) +{ + struct device *dev = &data->client->dev; + int error; + struct t7_config *new_config; + struct t7_config deepsleep = { .active = 0, .idle = 0 }; - if (retry > 20) { - data->state = FAILED; - goto release_firmware; - } + if (sleep == MXT_POWER_CFG_DEEPSLEEP) + new_config = &deepsleep; + else + new_config = &data->t7_cfg; + + error = __mxt_write_reg(data->client, data->T7_address, + sizeof(data->t7_cfg), new_config); + if (error) + return error; + + dev_dbg(dev, "Set T7 ACTV:%d IDLE:%d\n", + new_config->active, new_config->idle); + + return 0; +} + +static int mxt_init_t7_power_cfg(struct mxt_data *data) +{ + struct device *dev = &data->client->dev; + int error; + bool retry = false; + +recheck: + error = __mxt_read_reg(data->client, data->T7_address, + sizeof(data->t7_cfg), &data->t7_cfg); + if (error) + return error; + + if (data->t7_cfg.active == 0 || data->t7_cfg.idle == 0) { + if (!retry) { + dev_dbg(dev, "T7 cfg zero, resetting\n"); + mxt_soft_reset(data); + retry = true; + goto recheck; } else { - retry = 0; - pos += frame_size; - frame++; + dev_dbg(dev, "T7 cfg zero after reset, overriding\n"); + data->t7_cfg.active = 20; + data->t7_cfg.idle = 100; + return mxt_set_t7_power_cfg(data, MXT_POWER_CFG_RUN); } + } - if (frame % 10 == 0) - dev_info(dev, "Updated %d frames, %d/%zd bytes\n", - frame, pos, fw->size); + dev_dbg(dev, "Initialized power cfg: ACTV %d, IDLE %d\n", + data->t7_cfg.active, data->t7_cfg.idle); + return 0; +} +#ifdef CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 +static u16 mxt_get_debug_value(struct mxt_data *data, unsigned int x, + unsigned int y) +{ + struct mxt_info *info = &data->info; + struct mxt_dbg *dbg = &data->dbg; + unsigned int ofs, page; + unsigned int col = 0; + unsigned int col_width; + + if (info->family_id == MXT_FAMILY_1386) { + col_width = info->matrix_ysize / MXT1386_COLUMNS; + col = y / col_width; + y = y % col_width; + } else { + col_width = info->matrix_ysize; } - dev_info(dev, "Finished, sent %d frames, %zd bytes\n", frame, pos); + ofs = (y + (x * col_width)) * sizeof(u16); + page = ofs / MXT_DIAGNOSTIC_SIZE; + ofs %= MXT_DIAGNOSTIC_SIZE; - data->state = INIT; + if (info->family_id == MXT_FAMILY_1386) + page += col * MXT1386_PAGES_PER_COLUMN; -release_firmware: - release_firmware(fw); - return ret; + return get_unaligned_le16(&dbg->t37_buf[page].data[ofs]); } -static ssize_t mxt_update_fw_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) +static int mxt_convert_debug_pages(struct mxt_data *data, u16 *outbuf) { - struct mxt_data *data = dev_get_drvdata(dev); - int error; + struct mxt_dbg *dbg = &data->dbg; + unsigned int x = 0; + unsigned int y = 0; + unsigned int i, rx, ry; - disable_irq(data->irq); + for (i = 0; i < dbg->t37_nodes; i++) { + /* Handle orientation */ + rx = data->xy_switch ? y : x; + ry = data->xy_switch ? x : y; + rx = data->invertx ? (data->xsize - 1 - rx) : rx; + ry = data->inverty ? (data->ysize - 1 - ry) : ry; - error = mxt_load_fw(dev, MXT_FW_NAME); - if (error) { - dev_err(dev, "The firmware update failed(%d)\n", error); - count = error; - } else { - dev_info(dev, "The firmware update succeeded\n"); + outbuf[i] = mxt_get_debug_value(data, rx, ry); - /* Wait for reset */ - msleep(MXT_FWRESET_TIME); + /* Next value */ + if (++x >= (data->xy_switch ? data->ysize : data->xsize)) { + x = 0; + y++; + } + } - kfree(data->object_table); - data->object_table = NULL; - kfree(data->msg_buf); - data->msg_buf = NULL; + return 0; +} + +static int mxt_read_diagnostic_debug(struct mxt_data *data, u8 mode, + u16 *outbuf) +{ + struct mxt_dbg *dbg = &data->dbg; + int retries = 0; + int page; + int ret; + u8 cmd = mode; + struct t37_debug *p; + u8 cmd_poll; - mxt_initialize(data); + for (page = 0; page < dbg->t37_pages; page++) { + p = dbg->t37_buf + page; + + ret = mxt_write_reg(data->client, dbg->diag_cmd_address, + cmd); + if (ret) + return ret; + + retries = 0; + msleep(20); +wait_cmd: + /* Read back command byte */ + ret = __mxt_read_reg(data->client, dbg->diag_cmd_address, + sizeof(cmd_poll), &cmd_poll); + if (ret) + return ret; + + /* Field is cleared once the command has been processed */ + if (cmd_poll) { + if (retries++ > 100) + return -EINVAL; + + msleep(20); + goto wait_cmd; + } + + /* Read T37 page */ + ret = __mxt_read_reg(data->client, dbg->t37_address, + sizeof(struct t37_debug), p); + if (ret) + return ret; + + if (p->mode != mode || p->page != page) { + dev_err(&data->client->dev, "T37 page mismatch\n"); + return -EINVAL; + } + + dev_dbg(&data->client->dev, "%s page:%d retries:%d\n", + __func__, page, retries); + + /* For remaining pages, write PAGEUP rather than mode */ + cmd = MXT_DIAGNOSTIC_PAGEUP; } - if (data->state == APPMODE) { - enable_irq(data->irq); + return mxt_convert_debug_pages(data, outbuf); +} + +static int mxt_queue_setup(struct vb2_queue *q, + unsigned int *nbuffers, unsigned int *nplanes, + unsigned int sizes[], struct device *alloc_devs[]) +{ + struct mxt_data *data = q->drv_priv; + size_t size = data->dbg.t37_nodes * sizeof(u16); + + if (*nplanes) + return sizes[0] < size ? -EINVAL : 0; + + *nplanes = 1; + sizes[0] = size; + + return 0; +} + +static void mxt_buffer_queue(struct vb2_buffer *vb) +{ + struct mxt_data *data = vb2_get_drv_priv(vb->vb2_queue); + u16 *ptr; + int ret; + u8 mode; + + ptr = vb2_plane_vaddr(vb, 0); + if (!ptr) { + dev_err(&data->client->dev, "Error acquiring frame ptr\n"); + goto fault; } - return count; + switch (data->dbg.input) { + case MXT_V4L_INPUT_DELTAS: + default: + mode = MXT_DIAGNOSTIC_DELTAS; + break; + + case MXT_V4L_INPUT_REFS: + mode = MXT_DIAGNOSTIC_REFS; + break; + } + + ret = mxt_read_diagnostic_debug(data, mode, ptr); + if (ret) + goto fault; + + vb2_set_plane_payload(vb, 0, data->dbg.t37_nodes * sizeof(u16)); + vb2_buffer_done(vb, VB2_BUF_STATE_DONE); + return; + +fault: + vb2_buffer_done(vb, VB2_BUF_STATE_ERROR); } -static ssize_t mxt_version_show(struct device *dev, - struct device_attribute *attr, char *buf) +/* V4L2 structures */ +static const struct vb2_ops mxt_queue_ops = { + .queue_setup = mxt_queue_setup, + .buf_queue = mxt_buffer_queue, + .wait_prepare = vb2_ops_wait_prepare, + .wait_finish = vb2_ops_wait_finish, +}; + +static const struct vb2_queue mxt_queue = { + .type = V4L2_BUF_TYPE_VIDEO_CAPTURE, + .io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF | VB2_READ, + .buf_struct_size = sizeof(struct mxt_vb2_buffer), + .ops = &mxt_queue_ops, + .mem_ops = &vb2_vmalloc_memops, + .timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC, + .min_buffers_needed = 1, +}; + +static int mxt_vidioc_querycap(struct file *file, void *priv, + struct v4l2_capability *cap) { - struct mxt_data *data = dev_get_drvdata(dev); - int count = 0; + struct mxt_data *data = video_drvdata(file); - count += sprintf(buf + count, "%d", data->info.version); - count += sprintf(buf + count, "\n"); + strlcpy(cap->driver, "atmel_mxt_ts", sizeof(cap->driver)); + strlcpy(cap->card, "atmel_mxt_ts touch", sizeof(cap->card)); + snprintf(cap->bus_info, sizeof(cap->bus_info), + "I2C:%s", dev_name(&data->client->dev)); + return 0; +} - return count; +static int mxt_vidioc_enum_input(struct file *file, void *priv, + struct v4l2_input *i) +{ + if (i->index >= MXT_V4L_INPUT_MAX) + return -EINVAL; + + i->type = V4L2_INPUT_TYPE_TOUCH; + + switch (i->index) { + case MXT_V4L_INPUT_REFS: + strlcpy(i->name, "Mutual Capacitance References", + sizeof(i->name)); + break; + case MXT_V4L_INPUT_DELTAS: + strlcpy(i->name, "Mutual Capacitance Deltas", sizeof(i->name)); + break; + } + + return 0; } -static ssize_t mxt_build_show(struct device *dev, - struct device_attribute *attr, char *buf) +static int mxt_set_input(struct mxt_data *data, unsigned int i) { - struct mxt_data *data = dev_get_drvdata(dev); - int count = 0; + struct v4l2_pix_format *f = &data->dbg.format; - count += sprintf(buf + count, "%d", data->info.build); - count += sprintf(buf + count, "\n"); + if (i >= MXT_V4L_INPUT_MAX) + return -EINVAL; - return count; + if (i == MXT_V4L_INPUT_DELTAS) + f->pixelformat = V4L2_TCH_FMT_DELTA_TD16; + else + f->pixelformat = V4L2_TCH_FMT_TU16; + + f->width = data->xy_switch ? data->ysize : data->xsize; + f->height = data->xy_switch ? data->xsize : data->ysize; + f->field = V4L2_FIELD_NONE; + f->colorspace = V4L2_COLORSPACE_RAW; + f->bytesperline = f->width * sizeof(u16); + f->sizeimage = f->width * f->height * sizeof(u16); + + data->dbg.input = i; + + return 0; } -static ssize_t mxt_pause_show(struct device *dev, - struct device_attribute *attr, char *buf) +static int mxt_vidioc_s_input(struct file *file, void *priv, unsigned int i) { - struct mxt_data *data = dev_get_drvdata(dev); - ssize_t count; - char c; + return mxt_set_input(video_drvdata(file), i); +} - c = data->driver_paused ? '1' : '0'; - count = sprintf(buf, "%c\n", c); +static int mxt_vidioc_g_input(struct file *file, void *priv, unsigned int *i) +{ + struct mxt_data *data = video_drvdata(file); - return count; + *i = data->dbg.input; + + return 0; } -static ssize_t mxt_pause_store(struct device *dev, - struct device_attribute *attr, const char *buf, size_t count) +static int mxt_vidioc_fmt(struct file *file, void *priv, struct v4l2_format *f) { - struct mxt_data *data = dev_get_drvdata(dev); - int i; + struct mxt_data *data = video_drvdata(file); - if (sscanf(buf, "%u", &i) == 1 && i < 2) { - data->driver_paused = (i == 1); - dev_dbg(dev, "%s\n", i ? "paused" : "unpaused"); - return count; - } else { - dev_dbg(dev, "pause_driver write error\n"); + f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + f->fmt.pix = data->dbg.format; + + return 0; +} + +static int mxt_vidioc_enum_fmt(struct file *file, void *priv, + struct v4l2_fmtdesc *fmt) +{ + if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) + return -EINVAL; + + switch (fmt->index) { + case 0: + fmt->pixelformat = V4L2_TCH_FMT_TU16; + break; + + case 1: + fmt->pixelformat = V4L2_TCH_FMT_DELTA_TD16; + break; + + default: return -EINVAL; } + + return 0; +} + +static int mxt_vidioc_g_parm(struct file *file, void *fh, + struct v4l2_streamparm *a) +{ + if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) + return -EINVAL; + + a->parm.capture.readbuffers = 1; + a->parm.capture.timeperframe.numerator = 1; + a->parm.capture.timeperframe.denominator = 10; + return 0; +} + +static const struct v4l2_ioctl_ops mxt_video_ioctl_ops = { + .vidioc_querycap = mxt_vidioc_querycap, + + .vidioc_enum_fmt_vid_cap = mxt_vidioc_enum_fmt, + .vidioc_s_fmt_vid_cap = mxt_vidioc_fmt, + .vidioc_g_fmt_vid_cap = mxt_vidioc_fmt, + .vidioc_try_fmt_vid_cap = mxt_vidioc_fmt, + .vidioc_g_parm = mxt_vidioc_g_parm, + + .vidioc_enum_input = mxt_vidioc_enum_input, + .vidioc_g_input = mxt_vidioc_g_input, + .vidioc_s_input = mxt_vidioc_s_input, + + .vidioc_reqbufs = vb2_ioctl_reqbufs, + .vidioc_create_bufs = vb2_ioctl_create_bufs, + .vidioc_querybuf = vb2_ioctl_querybuf, + .vidioc_qbuf = vb2_ioctl_qbuf, + .vidioc_dqbuf = vb2_ioctl_dqbuf, + .vidioc_expbuf = vb2_ioctl_expbuf, + + .vidioc_streamon = vb2_ioctl_streamon, + .vidioc_streamoff = vb2_ioctl_streamoff, +}; + +static const struct video_device mxt_video_device = { + .name = "Atmel maxTouch", + .fops = &mxt_video_fops, + .ioctl_ops = &mxt_video_ioctl_ops, + .release = video_device_release_empty, + .device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_TOUCH | + V4L2_CAP_READWRITE | V4L2_CAP_STREAMING, +}; + +static void mxt_debug_init(struct mxt_data *data) +{ + struct mxt_info *info = &data->info; + struct mxt_dbg *dbg = &data->dbg; + struct mxt_object *object; + int error; + + object = mxt_get_object(data, MXT_GEN_COMMAND_T6); + if (!object) + goto error; + + dbg->diag_cmd_address = object->start_address + MXT_COMMAND_DIAGNOSTIC; + + object = mxt_get_object(data, MXT_DEBUG_DIAGNOSTIC_T37); + if (!object) + goto error; + + if (mxt_obj_size(object) != sizeof(struct t37_debug)) { + dev_warn(&data->client->dev, "Bad T37 size"); + goto error; + } + + dbg->t37_address = object->start_address; + + /* Calculate size of data and allocate buffer */ + dbg->t37_nodes = data->xsize * data->ysize; + + if (info->family_id == MXT_FAMILY_1386) + dbg->t37_pages = MXT1386_COLUMNS * MXT1386_PAGES_PER_COLUMN; + else + dbg->t37_pages = DIV_ROUND_UP(data->xsize * + data->info.matrix_ysize * + sizeof(u16), + sizeof(dbg->t37_buf->data)); + + dbg->t37_buf = devm_kmalloc_array(&data->client->dev, dbg->t37_pages, + sizeof(struct t37_debug), GFP_KERNEL); + if (!dbg->t37_buf) + goto error; + + /* init channel to zero */ + mxt_set_input(data, 0); + + /* register video device */ + snprintf(dbg->v4l2.name, sizeof(dbg->v4l2.name), "%s", "atmel_mxt_ts"); + error = v4l2_device_register(&data->client->dev, &dbg->v4l2); + if (error) + goto error; + + /* initialize the queue */ + mutex_init(&dbg->lock); + dbg->queue = mxt_queue; + dbg->queue.drv_priv = data; + dbg->queue.lock = &dbg->lock; + dbg->queue.dev = &data->client->dev; + + error = vb2_queue_init(&dbg->queue); + if (error) + goto error_unreg_v4l2; + + dbg->vdev = mxt_video_device; + dbg->vdev.v4l2_dev = &dbg->v4l2; + dbg->vdev.lock = &dbg->lock; + dbg->vdev.vfl_dir = VFL_DIR_RX; + dbg->vdev.queue = &dbg->queue; + video_set_drvdata(&dbg->vdev, data); + + error = video_register_device(&dbg->vdev, VFL_TYPE_TOUCH, -1); + if (error) + goto error_unreg_v4l2; + + return; + +error_unreg_v4l2: + v4l2_device_unregister(&dbg->v4l2); +error: + dev_warn(&data->client->dev, "Error initializing T37\n"); +} +#else +static void mxt_debug_init(struct mxt_data *data) +{ +} +#endif + +static int mxt_configure_objects(struct mxt_data *data, + const struct firmware *cfg) +{ + struct device *dev = &data->client->dev; + struct mxt_info *info = &data->info; + int error; + + error = mxt_init_t7_power_cfg(data); + if (error) { + dev_err(dev, "Failed to initialize power cfg\n"); + return error; + } + + if (cfg) { + error = mxt_update_cfg(data, cfg); + if (error) + dev_warn(dev, "Error %d updating config\n", error); + } + + if (data->multitouch) { + error = mxt_initialize_input_device(data); + if (error) + return error; + } else { + dev_warn(dev, "No touch object detected\n"); + } + + mxt_debug_init(data); + + 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; } -static ssize_t mxt_debug_enable_show(struct device *dev, - struct device_attribute *attr, char *buf) +/* Firmware Version is returned as Major.Minor.Build */ +static ssize_t mxt_fw_version_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct mxt_data *data = dev_get_drvdata(dev); - int count; - char c; + struct mxt_info *info = &data->info; + return scnprintf(buf, PAGE_SIZE, "%u.%u.%02X\n", + info->version >> 4, info->version & 0xf, info->build); +} - c = data->debug_enabled ? '1' : '0'; - count = sprintf(buf, "%c\n", c); +/* Hardware Version is returned as FamilyID.VariantID */ +static ssize_t mxt_hw_version_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct mxt_data *data = dev_get_drvdata(dev); + struct mxt_info *info = &data->info; + return scnprintf(buf, PAGE_SIZE, "%u.%u\n", + info->family_id, info->variant_id); +} + +static ssize_t mxt_show_instance(char *buf, int count, + struct mxt_object *object, int instance, + const u8 *val) +{ + int i; + + if (mxt_obj_instances(object) > 1) + count += scnprintf(buf + count, PAGE_SIZE - count, + "Instance %u\n", instance); + + 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"); return count; } -static ssize_t mxt_debug_enable_store(struct device *dev, - struct device_attribute *attr, const char *buf, size_t count) +static ssize_t mxt_object_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct mxt_data *data = dev_get_drvdata(dev); - int i; + struct mxt_object *object; + int count = 0; + int i, j; + int error; + u8 *obuf; - if (sscanf(buf, "%u", &i) == 1 && i < 2) { - data->debug_enabled = (i == 1); + /* Pre-allocate buffer large enough to hold max sized object. */ + obuf = kmalloc(256, GFP_KERNEL); + if (!obuf) + return -ENOMEM; - dev_dbg(dev, "%s\n", i ? "debug enabled" : "debug disabled"); - return count; - } else { - dev_dbg(dev, "debug_enabled write error\n"); - return -EINVAL; + error = 0; + for (i = 0; i < data->info.object_num; i++) { + object = data->object_table + i; + + if (!mxt_object_readable(object->type)) + continue; + + count += scnprintf(buf + count, PAGE_SIZE - count, + "T%u:\n", object->type); + + 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); + if (error) + goto done; + + count = mxt_show_instance(buf, count, object, j, obuf); + } } + +done: + kfree(obuf); + return error ?: count; } -static int mxt_check_mem_access_params(struct mxt_data *data, loff_t off, - size_t *count) +static int mxt_check_firmware_format(struct device *dev, + const struct firmware *fw) { - if (data->state != APPMODE) { - dev_err(&data->client->dev, "Not in APPMODE\n"); - return -EINVAL; + 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); + 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); + if (ret) { + dev_err(dev, "Unable to open firmware %s\n", fn); + return ret; } - if (off >= data->mem_size) - return -EIO; + /* Check for incorrect enc file */ + ret = mxt_check_firmware_format(dev, fw); + if (ret) + goto release_firmware; - if (off + *count > data->mem_size) - *count = data->mem_size - off; + if (!data->in_bootloader) { + /* Change to the bootloader mode */ + data->in_bootloader = true; - if (*count > MXT_MAX_BLOCK_WRITE) - *count = MXT_MAX_BLOCK_WRITE; + ret = mxt_t6_command(data, MXT_COMMAND_RESET, + MXT_BOOT_VALUE, false); + if (ret) + goto release_firmware; - return 0; -} + msleep(MXT_RESET_TIME); -static ssize_t mxt_slowscan_show(struct device *dev, - struct device_attribute *attr, char *buf) -{ - struct mxt_data *data = dev_get_drvdata(dev); - int count = 0; - int error; - u8 actv_cycle_time; - u8 idle_cycle_time; - u8 actv2idle_timeout; - dev_info(dev, "Calling mxt_slowscan_show()\n"); + /* Do not need to scan since we know family ID */ + ret = mxt_lookup_bootloader_address(data, 0); + if (ret) + goto release_firmware; - error = mxt_read_object(data, MXT_GEN_POWER_T7, - MXT_POWER_ACTVACQINT, - &actv_cycle_time); + mxt_free_input_device(data); + mxt_free_object_table(data); + } else { + enable_irq(data->irq); + } - if (error) - return error; + reinit_completion(&data->bl_completion); - error = mxt_read_object(data, MXT_GEN_POWER_T7, - MXT_POWER_IDLEACQINT, - &idle_cycle_time); + 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"); - if (error) - return error; + /* Unlock bootloader */ + ret = mxt_send_bootloader_cmd(data, true); + if (ret) + goto disable_irq; + } - error = mxt_read_object(data, MXT_GEN_POWER_T7, - MXT_POWER_ACTV2IDLETO, - &actv2idle_timeout); + while (pos < fw->size) { + ret = mxt_check_bootloader(data, MXT_WAITING_FRAME_DATA, true); + if (ret) + goto disable_irq; - if (error) - return error; + frame_size = ((*(fw->data + pos) << 8) | *(fw->data + pos + 1)); - count += sprintf(buf + count, - "SLOW SCAN (enable/disable) = %s.\n", - data->slowscan_enabled ? "enabled" : "disabled"); - count += sprintf(buf + count, - "SLOW SCAN (actv_cycle_time) = %umS.\n", - data->slowscan_actv_cycle_time); - count += sprintf(buf + count, - "SLOW SCAN (idle_cycle_time) = %umS.\n", - data->slowscan_idle_cycle_time); - count += sprintf(buf + count, - "SLOW SCAN (actv2idle_timeout) = %u.%0uS.\n", - data->slowscan_actv2idle_timeout / 10, - data->slowscan_actv2idle_timeout % 10); - count += sprintf(buf + count, - "CURRENT (actv_cycle_time) = %umS.\n", - actv_cycle_time); - count += sprintf(buf + count, - "CURRENT (idle_cycle_time) = %umS.\n", - idle_cycle_time); - count += sprintf(buf + count, - "CURRENT (actv2idle_timeout) = %u.%0uS.\n", - actv2idle_timeout / 10, actv2idle_timeout % 10); + /* Take account of CRC bytes */ + frame_size += 2; - return count; -} + /* Write one frame to device */ + ret = mxt_bootloader_write(data, fw->data + pos, frame_size); + if (ret) + goto disable_irq; -static ssize_t mxt_slowscan_store(struct device *dev, - struct device_attribute *attr, const char *buf, size_t count) -{ - struct mxt_data *data = dev_get_drvdata(dev); - int fn; - int val; - int ret; + ret = mxt_check_bootloader(data, MXT_FRAME_CRC_PASS, true); + if (ret) { + retry++; - dev_info(dev, "Calling mxt_slowscan_store()\n"); - ret = sscanf(buf, "%u %u", &fn, &val); - if ((ret == 1) || (ret == 2)) { - switch (fn) { - case SLOSCAN_DISABLE: - if (data->slowscan_enabled) { - data->actv_cycle_time = - data->slowscan_shad_actv_cycle_time; - data->idle_cycle_time = - data->slowscan_shad_idle_cycle_time; - data->actv2idle_timeout = - data->slowscan_shad_actv2idle_timeout; - data->slowscan_enabled = 0; - mxt_set_power_cfg(data, 0); - } - break; + /* Back off by 20ms per retry */ + msleep(retry * 20); - case SLOSCAN_ENABLE: - if (!data->slowscan_enabled) { - data->slowscan_shad_actv_cycle_time = - data->actv_cycle_time; - data->slowscan_shad_idle_cycle_time = - data->idle_cycle_time; - data->slowscan_shad_actv2idle_timeout = - data->actv2idle_timeout; - data->actv_cycle_time = - data->slowscan_actv_cycle_time; - data->idle_cycle_time = - data->slowscan_idle_cycle_time; - data->actv2idle_timeout = - data->slowscan_actv2idle_timeout; - data->slowscan_enabled = 1; - mxt_set_power_cfg(data, 0); + if (retry > 20) { + dev_err(dev, "Retry count exceeded\n"); + goto disable_irq; } - break; - - case SLOSCAN_SET_ACTVACQINT: - data->slowscan_actv_cycle_time = val; - break; - - case SLOSCAN_SET_IDLEACQINT: - data->slowscan_idle_cycle_time = val; - break; - - case SLOSCAN_SET_ACTV2IDLETO: - data->slowscan_actv2idle_timeout = val; - break; + } 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); } - return count; -} -static ssize_t mxt_mem_access_read(struct file *filp, struct kobject *kobj, - struct bin_attribute *bin_attr, char *buf, loff_t off, size_t count) -{ - struct device *dev = container_of(kobj, struct device, kobj); - struct mxt_data *data = dev_get_drvdata(dev); - int ret = 0; + /* Wait for flash. */ + ret = mxt_wait_for_completion(data, &data->bl_completion, + MXT_FW_RESET_TIME); + if (ret) + goto disable_irq; - ret = mxt_check_mem_access_params(data, off, &count); - if (ret < 0) - return ret; + 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); - if (count > 0) - ret = mxt_read_reg(data->client, off, count, buf); + data->in_bootloader = false; - return ret == 0 ? count : ret; +disable_irq: + disable_irq(data->irq); +release_firmware: + release_firmware(fw); + return ret; } -static ssize_t mxt_mem_access_write(struct file *filp, struct kobject *kobj, - struct bin_attribute *bin_attr, char *buf, loff_t off, - size_t count) +static ssize_t mxt_update_fw_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) { - struct device *dev = container_of(kobj, struct device, kobj); struct mxt_data *data = dev_get_drvdata(dev); - int ret = 0; + int error; - ret = mxt_check_mem_access_params(data, off, &count); - if (ret < 0) - return ret; + error = mxt_load_fw(dev, MXT_FW_NAME); + if (error) { + dev_err(dev, "The firmware update failed(%d)\n", error); + count = error; + } else { + dev_info(dev, "The firmware update succeeded\n"); - if (count > 0) - ret = mxt_write_block(data->client, off, count, buf); + error = mxt_initialize(data); + if (error) + return error; + } - return ret == 0 ? count : 0; + return count; } +static DEVICE_ATTR(fw_version, S_IRUGO, mxt_fw_version_show, NULL); +static DEVICE_ATTR(hw_version, S_IRUGO, mxt_hw_version_show, NULL); +static DEVICE_ATTR(object, S_IRUGO, mxt_object_show, NULL); static DEVICE_ATTR(update_fw, S_IWUSR, NULL, mxt_update_fw_store); -static DEVICE_ATTR(debug_enable, S_IWUSR | S_IRUSR, mxt_debug_enable_show, - mxt_debug_enable_store); -static DEVICE_ATTR(pause_driver, S_IWUSR | S_IRUSR, mxt_pause_show, - mxt_pause_store); -static DEVICE_ATTR(version, S_IRUGO, mxt_version_show, NULL); -static DEVICE_ATTR(build, S_IRUGO, mxt_build_show, NULL); -static DEVICE_ATTR(slowscan_enable, S_IWUSR | S_IRUSR, - mxt_slowscan_show, mxt_slowscan_store); static struct attribute *mxt_attrs[] = { + &dev_attr_fw_version.attr, + &dev_attr_hw_version.attr, + &dev_attr_object.attr, &dev_attr_update_fw.attr, - &dev_attr_debug_enable.attr, - &dev_attr_pause_driver.attr, - &dev_attr_version.attr, - &dev_attr_build.attr, - &dev_attr_slowscan_enable.attr, NULL }; @@ -2379,39 +2873,41 @@ static const struct attribute_group mxt_attr_group = { static void mxt_start(struct mxt_data *data) { - int error; - struct device *dev = &data->client->dev; - - if (data->is_stopped == 0) - return; + switch (data->pdata->suspend_mode) { + case MXT_SUSPEND_T9_CTRL: + mxt_soft_reset(data); - error = mxt_set_power_cfg(data, MXT_POWER_CFG_RUN); - if (error) - return; + /* Touch enable */ + /* 0x83 = SCANEN | RPTEN | ENABLE */ + mxt_write_object(data, + MXT_TOUCH_MULTI_T9, MXT_T9_CTRL, 0x83); + break; - /* At this point, it may be necessary to clear state - * by disabling/re-enabling the noise suppression object */ + case MXT_SUSPEND_DEEP_SLEEP: + default: + mxt_set_t7_power_cfg(data, MXT_POWER_CFG_RUN); - /* Recalibrate since chip has been in deep sleep */ - error = mxt_write_object(data, MXT_GEN_COMMAND_T6, - MXT_COMMAND_CALIBRATE, 1); + /* Recalibrate since chip has been in deep sleep */ + mxt_t6_command(data, MXT_COMMAND_CALIBRATE, 1, false); + break; + } - if (!error) - dev_dbg(dev, "MXT started\n"); } static void mxt_stop(struct mxt_data *data) { - int error; - struct device *dev = &data->client->dev; - - if (data->is_stopped) - return; - - error = mxt_set_power_cfg(data, MXT_POWER_CFG_DEEPSLEEP); + switch (data->pdata->suspend_mode) { + case MXT_SUSPEND_T9_CTRL: + /* Touch disable */ + mxt_write_object(data, + MXT_TOUCH_MULTI_T9, MXT_T9_CTRL, 0); + break; - if (!error) - dev_dbg(dev, "MXT suspended\n"); + case MXT_SUSPEND_DEEP_SLEEP: + default: + mxt_set_t7_power_cfg(data, MXT_POWER_CFG_DEEPSLEEP); + break; + } } static int mxt_input_open(struct input_dev *dev) @@ -2430,96 +2926,203 @@ static void mxt_input_close(struct input_dev *dev) mxt_stop(data); } -static int mxt_initialize_input_device(struct mxt_data *data) +#ifdef CONFIG_OF +static const struct mxt_platform_data *mxt_parse_dt(struct i2c_client *client) { - struct device *dev = &data->client->dev; - struct input_dev *input_dev; - int ret; - int key; + struct mxt_platform_data *pdata; + struct device_node *np = client->dev.of_node; + u32 *keymap; + int proplen, ret; - /* Initialize input device */ - input_dev = input_allocate_device(); - if (!input_dev) { - dev_err(dev, "Failed to allocate input device\n"); - return -ENOMEM; - } + if (!np) + return ERR_PTR(-ENOENT); - if (data->pdata->input_name) { - input_dev->name = data->pdata->input_name; - } else { - input_dev->name = "atmel-maxtouch"; + pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL); + if (!pdata) + return ERR_PTR(-ENOMEM); + + if (of_find_property(np, "linux,gpio-keymap", &proplen)) { + pdata->t19_num_keys = proplen / sizeof(u32); + + keymap = devm_kzalloc(&client->dev, + pdata->t19_num_keys * sizeof(keymap[0]), + GFP_KERNEL); + if (!keymap) + return ERR_PTR(-ENOMEM); + + ret = of_property_read_u32_array(np, "linux,gpio-keymap", + keymap, pdata->t19_num_keys); + if (ret) + dev_warn(&client->dev, + "Couldn't read linux,gpio-keymap: %d\n", ret); + + pdata->t19_keymap = keymap; } - input_dev->id.bustype = BUS_I2C; - input_dev->dev.parent = dev; - input_dev->open = mxt_input_open; - input_dev->close = mxt_input_close; + pdata->suspend_mode = MXT_SUSPEND_DEEP_SLEEP; - __set_bit(EV_ABS, input_dev->evbit); - __set_bit(EV_KEY, input_dev->evbit); - __set_bit(BTN_TOUCH, input_dev->keybit); + return pdata; +} +#else +static const struct mxt_platform_data *mxt_parse_dt(struct i2c_client *client) +{ + return ERR_PTR(-ENOENT); +} +#endif - /* 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); +#ifdef CONFIG_ACPI - /* For multi touch */ - input_mt_init_slots(input_dev, - data->num_touchids + data->num_stylusids, 0); - 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_abs_params(input_dev, ABS_MT_ORIENTATION, - 0, 255, 0, 0); +struct mxt_acpi_platform_data { + const char *hid; + struct mxt_platform_data pdata; +}; - /* For T63 active stylus */ - if (data->T63_reportid_min) { - __set_bit(BTN_STYLUS, input_dev->keybit); - __set_bit(BTN_STYLUS2, input_dev->keybit); +static unsigned int samus_touchpad_buttons[] = { + KEY_RESERVED, + KEY_RESERVED, + KEY_RESERVED, + BTN_LEFT +}; - input_set_abs_params(input_dev, ABS_MT_TOOL_TYPE, - 0, MT_TOOL_MAX, 0, 0); - } +static struct mxt_acpi_platform_data samus_platform_data[] = { + { + /* Touchpad */ + .hid = "ATML0000", + .pdata = { + .t19_num_keys = ARRAY_SIZE(samus_touchpad_buttons), + .t19_keymap = samus_touchpad_buttons, + }, + }, + { + /* Touchscreen */ + .hid = "ATML0001", + }, + { } +}; - /* For T15 key array */ - mxt_t15_keystatus = 0; - for (key = 0; key < ARRAY_SIZE(mxt_t15_keys); key++) { - input_set_capability(input_dev, EV_KEY, mxt_t15_keys[key]); - } +static unsigned int chromebook_tp_buttons[] = { + KEY_RESERVED, + KEY_RESERVED, + KEY_RESERVED, + KEY_RESERVED, + KEY_RESERVED, + BTN_LEFT +}; - input_set_drvdata(input_dev, data); - i2c_set_clientdata(data->client, data); +static struct mxt_acpi_platform_data chromebook_platform_data[] = { + { + /* Touchpad */ + .hid = "ATML0000", + .pdata = { + .t19_num_keys = ARRAY_SIZE(chromebook_tp_buttons), + .t19_keymap = chromebook_tp_buttons, + }, + }, + { + /* Touchscreen */ + .hid = "ATML0001", + }, + { } +}; - ret = input_register_device(input_dev); - if (ret) { - dev_err(dev, "Error %d registering input device\n", ret); - input_free_device(input_dev); - return ret; +static const struct dmi_system_id mxt_dmi_table[] = { + { + /* 2015 Google Pixel */ + .ident = "Chromebook Pixel 2", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"), + DMI_MATCH(DMI_PRODUCT_NAME, "Samus"), + }, + .driver_data = samus_platform_data, + }, + { + /* Other Google Chromebooks */ + .ident = "Chromebook", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"), + }, + .driver_data = chromebook_platform_data, + }, + { } +}; + +static const struct mxt_platform_data *mxt_parse_acpi(struct i2c_client *client) +{ + struct acpi_device *adev; + const struct dmi_system_id *system_id; + const struct mxt_acpi_platform_data *acpi_pdata; + + /* + * Ignore ACPI devices representing bootloader mode. + * + * This is a bit of a hack: Google Chromebook BIOS creates ACPI + * devices for both application and bootloader modes, but we are + * interested in application mode only (if device is in bootloader + * mode we'll end up switching into application anyway). So far + * application mode addresses were all above 0x40, so we'll use it + * as a threshold. + */ + if (client->addr < 0x40) + return ERR_PTR(-ENXIO); + + adev = ACPI_COMPANION(&client->dev); + if (!adev) + return ERR_PTR(-ENOENT); + + system_id = dmi_first_match(mxt_dmi_table); + if (!system_id) + return ERR_PTR(-ENOENT); + + acpi_pdata = system_id->driver_data; + if (!acpi_pdata) + return ERR_PTR(-ENOENT); + + while (acpi_pdata->hid) { + if (!strcmp(acpi_device_hid(adev), acpi_pdata->hid)) + return &acpi_pdata->pdata; + + acpi_pdata++; } - data->input_dev = input_dev; + return ERR_PTR(-ENOENT); +} +#else +static const struct mxt_platform_data *mxt_parse_acpi(struct i2c_client *client) +{ + return ERR_PTR(-ENOENT); +} +#endif - return 0; +static const struct mxt_platform_data * +mxt_get_platform_data(struct i2c_client *client) +{ + const struct mxt_platform_data *pdata; + + pdata = dev_get_platdata(&client->dev); + if (pdata) + return pdata; + + pdata = mxt_parse_dt(client); + if (!IS_ERR(pdata) || PTR_ERR(pdata) != -ENOENT) + return pdata; + + pdata = mxt_parse_acpi(client); + if (!IS_ERR(pdata) || PTR_ERR(pdata) != -ENOENT) + return pdata; + + dev_err(&client->dev, "No platform data specified\n"); + return ERR_PTR(-EINVAL); } -static int mxt_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int mxt_probe(struct i2c_client *client, const struct i2c_device_id *id) { - const struct mxt_platform_data *pdata = client->dev.platform_data; struct mxt_data *data; + const struct mxt_platform_data *pdata; int error; - if (!pdata) - return -EINVAL; + pdata = mxt_get_platform_data(client); + if (IS_ERR(pdata)) + return PTR_ERR(pdata); data = kzalloc(sizeof(struct mxt_data), GFP_KERNEL); if (!data) { @@ -2527,66 +3130,47 @@ static int mxt_probe(struct i2c_client *client, return -ENOMEM; } - data->state = INIT; + snprintf(data->phys, sizeof(data->phys), "i2c-%u-%04x/input0", + client->adapter->nr, client->addr); data->client = client; data->pdata = pdata; data->irq = client->irq; + i2c_set_clientdata(client, data); - mxt_initialize_regulator(data); - - /* Initialize i2c device */ - error = mxt_initialize(data); - if (error) - goto err_disable_regulator; - - error = mxt_initialize_input_device(data); - if (error) - goto err_free_object; + 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, client->dev.driver->name, data); + pdata->irqflags | IRQF_ONESHOT, + client->name, data); if (error) { - dev_err(&client->dev, "Error %d registering irq\n", error); - goto err_free_input_device; + dev_err(&client->dev, "Failed to register interrupt\n"); + goto err_free_mem; } + disable_irq(client->irq); + + error = mxt_initialize(data); + if (error) + goto err_free_irq; + error = sysfs_create_group(&client->dev.kobj, &mxt_attr_group); if (error) { dev_err(&client->dev, "Failure %d creating sysfs group\n", error); - goto err_free_irq; - } - - sysfs_bin_attr_init(&data->mem_access_attr); - data->mem_access_attr.attr.name = "mem_access"; - data->mem_access_attr.attr.mode = S_IRUGO | S_IWUSR; - data->mem_access_attr.read = mxt_mem_access_read; - data->mem_access_attr.write = mxt_mem_access_write; - data->mem_access_attr.size = data->mem_size; - - if (sysfs_create_bin_file(&client->dev.kobj, - &data->mem_access_attr) < 0) { - dev_err(&client->dev, "Failed to create %s\n", - data->mem_access_attr.attr.name); - goto err_remove_sysfs_group; + goto err_free_object; } return 0; -err_remove_sysfs_group: - sysfs_remove_group(&client->dev.kobj, &mxt_attr_group); +err_free_object: + mxt_free_input_device(data); + mxt_free_object_table(data); err_free_irq: free_irq(client->irq, data); -err_free_input_device: - input_unregister_device(data->input_dev); -err_free_object: - kfree(data->msg_buf); - kfree(data->object_table); -err_disable_regulator: - regulator_disable(data->regulator_avdd); - regulator_disable(data->regulator_vdd); - +err_free_mem: kfree(data); return error; } @@ -2595,30 +3179,24 @@ static int mxt_remove(struct i2c_client *client) { struct mxt_data *data = i2c_get_clientdata(client); - sysfs_remove_bin_file(&client->dev.kobj, &data->mem_access_attr); sysfs_remove_group(&client->dev.kobj, &mxt_attr_group); free_irq(data->irq, data); - input_unregister_device(data->input_dev); - kfree(data->msg_buf); - data->msg_buf = NULL; - kfree(data->object_table); - data->object_table = NULL; - regulator_disable(data->regulator_avdd); - regulator_disable(data->regulator_vdd); + mxt_free_input_device(data); + mxt_free_object_table(data); kfree(data); - data = NULL; return 0; } -#ifdef CONFIG_PM_SLEEP -static int mxt_suspend(struct device *dev) +static int __maybe_unused mxt_suspend(struct device *dev) { - int ret; struct i2c_client *client = to_i2c_client(dev); struct mxt_data *data = i2c_get_clientdata(client); struct input_dev *input_dev = data->input_dev; + if (!input_dev) + return 0; + mutex_lock(&input_dev->mutex); if (input_dev->users) @@ -2626,41 +3204,17 @@ static int mxt_suspend(struct device *dev) mutex_unlock(&input_dev->mutex); - if (data->regulator_vdd && data->regulator_avdd) { - ret = regulator_disable(data->regulator_avdd); - if (ret < 0) { - dev_err(dev, - "Atmel regulator disable for avdd failed: %d\n", ret); - } - ret = regulator_disable(data->regulator_vdd); - if (ret < 0) { - dev_err(dev, - "Atmel regulator disable for vdd failed: %d\n", ret); - } - } - return 0; } -static int mxt_resume(struct device *dev) +static int __maybe_unused mxt_resume(struct device *dev) { - int ret; struct i2c_client *client = to_i2c_client(dev); struct mxt_data *data = i2c_get_clientdata(client); struct input_dev *input_dev = data->input_dev; - if (data->regulator_vdd && data->regulator_avdd) { - ret = regulator_enable(data->regulator_vdd); - if (ret < 0) { - dev_err(dev, - "Atmel regulator enable for vdd failed: %d\n", ret); - } - ret = regulator_enable(data->regulator_avdd); - if (ret < 0) { - dev_err(dev, - "Atmel regulator enable for avdd failed: %d\n", ret); - } - } + if (!input_dev) + return 0; mutex_lock(&input_dev->mutex); @@ -2672,21 +3226,28 @@ static int mxt_resume(struct device *dev) return 0; } -#endif - static SIMPLE_DEV_PM_OPS(mxt_pm_ops, mxt_suspend, mxt_resume); -static void mxt_shutdown(struct i2c_client *client) -{ - struct mxt_data *data = i2c_get_clientdata(client); +static const struct of_device_id mxt_of_match[] = { + { .compatible = "atmel,maxtouch", }, + {}, +}; +MODULE_DEVICE_TABLE(of, mxt_of_match); - disable_irq(data->irq); - data->state = SHUTDOWN; -} +#ifdef CONFIG_ACPI +static const struct acpi_device_id mxt_acpi_id[] = { + { "ATML0000", 0 }, /* Touchpad */ + { "ATML0001", 0 }, /* Touchscreen */ + { } +}; +MODULE_DEVICE_TABLE(acpi, mxt_acpi_id); +#endif static const struct i2c_device_id mxt_id[] = { { "qt602240_ts", 0 }, { "atmel_mxt_ts", 0 }, + { "atmel_mxt_tp", 0 }, + { "maxtouch", 0 }, { "mXT224", 0 }, { } }; @@ -2695,30 +3256,18 @@ MODULE_DEVICE_TABLE(i2c, mxt_id); static struct i2c_driver mxt_driver = { .driver = { .name = "atmel_mxt_ts", - .owner = THIS_MODULE, + .of_match_table = of_match_ptr(mxt_of_match), + .acpi_match_table = ACPI_PTR(mxt_acpi_id), .pm = &mxt_pm_ops, }, .probe = mxt_probe, .remove = mxt_remove, - .shutdown = mxt_shutdown, .id_table = mxt_id, }; -static int __init mxt_init(void) -{ - return i2c_add_driver(&mxt_driver); -} - -static void __exit mxt_exit(void) -{ - i2c_del_driver(&mxt_driver); -} - -module_init(mxt_init); -module_exit(mxt_exit); +module_i2c_driver(mxt_driver); /* Module information */ MODULE_AUTHOR("Joonyoung Shim "); MODULE_DESCRIPTION("Atmel maXTouch Touchscreen driver"); MODULE_LICENSE("GPL"); - diff --git a/include/linux/i2c/atmel_mxt_ts.h b/include/linux/i2c/atmel_mxt_ts.h deleted file mode 100644 index 4a04f501aa5f..000000000000 --- a/include/linux/i2c/atmel_mxt_ts.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Atmel maXTouch Touchscreen driver - * - * Copyright (C) 2010 Samsung Electronics Co.Ltd - * Author: Joonyoung Shim - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - */ - -#ifndef __LINUX_ATMEL_MXT_TS_H -#define __LINUX_ATMEL_MXT_TS_H - -#include - -#define MXT224_I2C_ADDR1 0x4A -#define MXT224_I2C_ADDR2 0x4B -#define MXT1386_I2C_ADDR1 0x4C -#define MXT1386_I2C_ADDR2 0x4D -#define MXT1386_I2C_ADDR3 0x5A -#define MXT1386_I2C_ADDR4 0x5B - -/* For key_map array */ -#define MXT_NUM_GPIO 4 - -/* Orient */ -#define MXT_NORMAL 0x0 -#define MXT_DIAGONAL 0x1 -#define MXT_HORIZONTAL_FLIP 0x2 -#define MXT_ROTATED_90_COUNTER 0x3 -#define MXT_VERTICAL_FLIP 0x4 -#define MXT_ROTATED_90 0x5 -#define MXT_ROTATED_180 0x6 -#define MXT_DIAGONAL_COUNTER 0x7 - -#define CFG_NAME_SIZE 64 - -/* The platform data for the Atmel maXTouch touchscreen driver */ -struct mxt_platform_data { - unsigned long irqflags; - bool is_tp; - const unsigned int key_map[MXT_NUM_GPIO]; - u8(*read_chg) (void); - const char *input_name; - char mxt_cfg_name[CFG_NAME_SIZE]; -}; - -#endif /* __LINUX_ATMEL_MXT_TS_H */ - diff --git a/include/linux/platform_data/atmel_mxt_ts.h b/include/linux/platform_data/atmel_mxt_ts.h new file mode 100644 index 000000000000..695035a8d7fb --- /dev/null +++ b/include/linux/platform_data/atmel_mxt_ts.h @@ -0,0 +1,31 @@ +/* + * Atmel maXTouch Touchscreen driver + * + * Copyright (C) 2010 Samsung Electronics Co.Ltd + * Author: Joonyoung Shim + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + */ + +#ifndef __LINUX_PLATFORM_DATA_ATMEL_MXT_TS_H +#define __LINUX_PLATFORM_DATA_ATMEL_MXT_TS_H + +#include + +enum mxt_suspend_mode { + MXT_SUSPEND_DEEP_SLEEP = 0, + MXT_SUSPEND_T9_CTRL = 1, +}; + +/* The platform data for the Atmel maXTouch touchscreen driver */ +struct mxt_platform_data { + unsigned long irqflags; + u8 t19_num_keys; + const unsigned int *t19_keymap; + enum mxt_suspend_mode suspend_mode; +}; + +#endif /* __LINUX_PLATFORM_DATA_ATMEL_MXT_TS_H */ -- cgit v1.2.3