Convert to MT-B because Synaptics touch devices are capable of tracking identifiable fingers. Signed-off-by: Alexandra Chin <alexandra.chin@xxxxxxxxxxxxxxxx> --- Changes from v5: - Incorporated Henrik's review comments *rollback to v3 from v4 *fix odd line break in v3 - Include Alexandra in the list of authors Changes from v4: - Incorporated Henrik's review comments *split function synpatics_rmi4_touchscreen_report *split function synaptics_rmi4_i2c_query_device Changes from v3: - Incorporated Henrik's review comments *remove 'else' after an error path return *add input_mt_sync_frame() for pointer emulation effects *correct names of touchscreen - Replace printk with dev_err Changes from v2: - Incorporated Henrik's review comments *directly report finger state with Type-B - Against 3.7-rcX *call input_mt_init_slots with INPUT_MT_DIRECT flag --- drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 245 ++++++++++++------------- 1 files changed, 114 insertions(+), 131 deletions(-) diff --git a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c index 277491a..7b636c7 100644 --- a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c +++ b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c @@ -1,10 +1,11 @@ /** * - * Synaptics Register Mapped Interface (RMI4) I2C Physical Layer Driver. - * Copyright (c) 2007-2010, Synaptics Incorporated + * Synaptics Register Mapped Interface (RMI4) I2C Touchscreen Driver. + * Copyright (c) 2007-2012, Synaptics Incorporated * * Author: Js HA <js.ha@xxxxxxxxxxxxxx> for ST-Ericsson * Author: Naveen Kumar G <naveen.gaddipati@xxxxxxxxxxxxxx> for ST-Ericsson + * Author: Alexandra Chin <alexandra.chin@xxxxxxxxxxxxxxxx> * Copyright 2010 (c) ST-Ericsson AB */ /* @@ -31,6 +32,7 @@ #include <linux/interrupt.h> #include <linux/regulator/consumer.h> #include <linux/module.h> +#include <linux/input/mt.h> #include "synaptics_i2c_rmi4.h" /* TODO: for multiple device support will need a per-device mutex */ @@ -63,12 +65,11 @@ #define MASK_4BIT 0x0F #define MASK_3BIT 0x07 #define MASK_2BIT 0x03 -#define TOUCHPAD_CTRL_INTR 0x8 +#define TOUCHSCREEN_CTRL_INTR 0x8 #define PDT_START_SCAN_LOCATION (0x00E9) #define PDT_END_SCAN_LOCATION (0x000A) #define PDT_ENTRY_SIZE (0x0006) -#define RMI4_NUMBER_OF_MAX_FINGERS (8) -#define SYNAPTICS_RMI4_TOUCHPAD_FUNC_NUM (0x11) +#define SYNAPTICS_RMI4_TOUCHSCREEN_FUNC_NUM (0x11) #define SYNAPTICS_RMI4_DEVICE_CONTROL_FUNC_NUM (0x01) /** @@ -164,6 +165,7 @@ struct synaptics_rmi4_device_info { * @regulator: pointer to the regulator structure * @wait: wait queue structure variable * @touch_stopped: flag to stop the thread function + * @fingers_supported: maximum supported fingers * * This structure gives the device data information. */ @@ -184,6 +186,7 @@ struct synaptics_rmi4_data { struct regulator *regulator; wait_queue_head_t wait; bool touch_stopped; + unsigned char fingers_supported; }; /** @@ -291,34 +294,33 @@ exit: } /** - * synpatics_rmi4_touchpad_report() - reports for the rmi4 touchpad device + * synpatics_rmi4_touchscreen_report() - reports for the rmi4 touchscreen device * @pdata: pointer to synaptics_rmi4_data structure * @rfi: pointer to synaptics_rmi4_fn structure * - * This function calls to reports for the rmi4 touchpad device + * This function calls to reports for the rmi4 touchscreen device */ -static int synpatics_rmi4_touchpad_report(struct synaptics_rmi4_data *pdata, +static int synpatics_rmi4_touchscreen_report(struct synaptics_rmi4_data *pdata, struct synaptics_rmi4_fn *rfi) { /* number of touch points - fingers down in this case */ int touch_count = 0; int finger; - int fingers_supported; int finger_registers; int reg; int finger_shift; int finger_status; int retval; + int x, y; + int wx, wy; unsigned short data_base_addr; unsigned short data_offset; unsigned char data_reg_blk_size; unsigned char values[2]; unsigned char data[DATA_LEN]; - int x[RMI4_NUMBER_OF_MAX_FINGERS]; - int y[RMI4_NUMBER_OF_MAX_FINGERS]; - int wx[RMI4_NUMBER_OF_MAX_FINGERS]; - int wy[RMI4_NUMBER_OF_MAX_FINGERS]; + unsigned char fingers_supported = pdata->fingers_supported; struct i2c_client *client = pdata->i2c_client; + struct input_dev *input_dev = pdata->input_dev; /* get 2D sensor finger data */ /* @@ -333,7 +335,6 @@ static int synpatics_rmi4_touchpad_report(struct synaptics_rmi4_data *pdata, * 10 = finger present but data may not be accurate, * 11 = reserved for product use. */ - fingers_supported = rfi->num_of_data_points; finger_registers = (fingers_supported + 3)/4; data_base_addr = rfi->fn_desc.data_base_addr; retval = synaptics_rmi4_i2c_block_read(pdata, data_base_addr, values, @@ -353,12 +354,16 @@ static int synpatics_rmi4_touchpad_report(struct synaptics_rmi4_data *pdata, reg = finger/4; /* bit shift to get finger's status */ finger_shift = (finger % 4) * 2; - finger_status = (values[reg] >> finger_shift) & 3; + finger_status = (values[reg] >> finger_shift) & MASK_2BIT; /* * if finger status indicates a finger is present then * read the finger data and report it */ - if (finger_status == 1 || finger_status == 2) { + input_mt_slot(input_dev, finger); + input_mt_report_slot_state(input_dev, MT_TOOL_FINGER, + finger_status != 0); + + if (finger_status) { /* Read the finger data */ data_offset = data_base_addr + ((finger * data_reg_blk_size) + @@ -367,50 +372,33 @@ static int synpatics_rmi4_touchpad_report(struct synaptics_rmi4_data *pdata, data_offset, data, data_reg_blk_size); if (retval != data_reg_blk_size) { - printk(KERN_ERR "%s:read data failed\n", + dev_err(&client->dev, "%s:read data failed\n", __func__); return 0; - } else { - x[touch_count] = - (data[0] << 4) | (data[2] & MASK_4BIT); - y[touch_count] = - (data[1] << 4) | - ((data[2] >> 4) & MASK_4BIT); - wy[touch_count] = - (data[3] >> 4) & MASK_4BIT; - wx[touch_count] = - (data[3] & MASK_4BIT); - - if (pdata->board->x_flip) - x[touch_count] = - pdata->sensor_max_x - - x[touch_count]; - if (pdata->board->y_flip) - y[touch_count] = - pdata->sensor_max_y - - y[touch_count]; } + x = (data[0] << 4) | (data[2] & MASK_4BIT); + y = (data[1] << 4) | ((data[2] >> 4) & MASK_4BIT); + wy = (data[3] >> 4) & MASK_4BIT; + wx = (data[3] & MASK_4BIT); + + if (pdata->board->x_flip) + x = pdata->sensor_max_x - x; + if (pdata->board->y_flip) + y = pdata->sensor_max_y - y; + + input_report_abs(input_dev, ABS_MT_TOUCH_MAJOR, + max(wx, wy)); + input_report_abs(input_dev, ABS_MT_POSITION_X, x); + input_report_abs(input_dev, ABS_MT_POSITION_Y, y); + /* number of active touch points */ touch_count++; } } - /* report to input subsystem */ - if (touch_count) { - for (finger = 0; finger < touch_count; finger++) { - input_report_abs(pdata->input_dev, ABS_MT_TOUCH_MAJOR, - max(wx[finger] , wy[finger])); - input_report_abs(pdata->input_dev, ABS_MT_POSITION_X, - x[finger]); - input_report_abs(pdata->input_dev, ABS_MT_POSITION_Y, - y[finger]); - input_mt_sync(pdata->input_dev); - } - } else - input_mt_sync(pdata->input_dev); - /* sync after groups of events */ - input_sync(pdata->input_dev); + input_mt_sync_frame(input_dev); + input_sync(input_dev); /* return the number of touch points */ return touch_count; } @@ -428,13 +416,13 @@ static int synaptics_rmi4_report_device(struct synaptics_rmi4_data *pdata, int touch = 0; struct i2c_client *client = pdata->i2c_client; static int num_error_reports; - if (rfi->fn_number != SYNAPTICS_RMI4_TOUCHPAD_FUNC_NUM) { + if (rfi->fn_number != SYNAPTICS_RMI4_TOUCHSCREEN_FUNC_NUM) { num_error_reports++; if (num_error_reports < MAX_ERROR_REPORT) dev_err(&client->dev, "%s:report not supported\n", __func__); } else - touch = synpatics_rmi4_touchpad_report(pdata, rfi); + touch = synpatics_rmi4_touchscreen_report(pdata, rfi); return touch; } /** @@ -510,15 +498,15 @@ static irqreturn_t synaptics_rmi4_irq(int irq, void *data) } /** - * synpatics_rmi4_touchpad_detect() - detects the rmi4 touchpad device + * synpatics_rmi4_touchscreen_detect() - detects the rmi4 touchscreen device * @pdata: pointer to synaptics_rmi4_data structure * @rfi: pointer to synaptics_rmi4_fn structure * @fd: pointer to synaptics_rmi4_fn_desc structure * @interruptcount: count the number of interrupts * - * This function calls to detects the rmi4 touchpad device + * This function calls to detects the rmi4 touchscreen device */ -static int synpatics_rmi4_touchpad_detect(struct synaptics_rmi4_data *pdata, +static int synpatics_rmi4_touchscreen_detect(struct synaptics_rmi4_data *pdata, struct synaptics_rmi4_fn *rfi, struct synaptics_rmi4_fn_desc *fd, unsigned int interruptcount) @@ -575,6 +563,7 @@ static int synpatics_rmi4_touchpad_detect(struct synaptics_rmi4_data *pdata, if ((queries[1] & MASK_3BIT) == 5) rfi->num_of_data_points = 10; } + pdata->fingers_supported = rfi->num_of_data_points; /* Need to get interrupt info for handling interrupts */ rfi->index_to_intr_reg = (interruptcount + 7)/8; if (rfi->index_to_intr_reg != 0) @@ -655,13 +644,13 @@ static int synpatics_rmi4_touchpad_detect(struct synaptics_rmi4_data *pdata, } /** - * synaptics_rmi4_touchpad_config() - configures the rmi4 touchpad device + * synaptics_rmi4_touchscreen_config() - configures the rmi4 touchscreen device * @pdata: pointer to synaptics_rmi4_data structure * @rfi: pointer to synaptics_rmi4_fn structure * - * This function calls to configures the rmi4 touchpad device + * This function calls to configures the rmi4 touchscreen device */ -int synaptics_rmi4_touchpad_config(struct synaptics_rmi4_data *pdata, +int synaptics_rmi4_touchscreen_config(struct synaptics_rmi4_data *pdata, struct synaptics_rmi4_fn *rfi) { /* @@ -741,51 +730,7 @@ static int synaptics_rmi4_i2c_query_device(struct synaptics_rmi4_data *pdata) return -EIO; } rfi = NULL; - if (rmi_fd.fn_number) { - switch (rmi_fd.fn_number & MASK_8BIT) { - case SYNAPTICS_RMI4_DEVICE_CONTROL_FUNC_NUM: - pdata->fn01_query_base_addr = - rmi_fd.query_base_addr; - pdata->fn01_ctrl_base_addr = - rmi_fd.ctrl_base_addr; - pdata->fn01_data_base_addr = - rmi_fd.data_base_addr; - break; - case SYNAPTICS_RMI4_TOUCHPAD_FUNC_NUM: - if (rmi_fd.intr_src_count) { - rfi = kmalloc(sizeof(*rfi), - GFP_KERNEL); - if (!rfi) { - dev_err(&client->dev, - "%s:kmalloc failed\n", - __func__); - return -ENOMEM; - } - retval = synpatics_rmi4_touchpad_detect - (pdata, rfi, - &rmi_fd, - intr_count); - if (retval < 0) { - kfree(rfi); - return retval; - } - } - break; - } - /* interrupt count for next iteration */ - intr_count += (rmi_fd.intr_src_count & MASK_3BIT); - /* - * We only want to add functions to the list - * that have data associated with them. - */ - if (rfi && rmi_fd.intr_src_count) { - /* link this function info to the RMI module */ - mutex_lock(&(pdata->fn_list_mutex)); - list_add_tail(&rfi->link, - &pdata->rmi4_mod_info.support_fn_list); - mutex_unlock(&(pdata->fn_list_mutex)); - } - } else { + if (!rmi_fd.fn_number) { /* * A zero in the function number * signals the end of the PDT @@ -794,6 +739,47 @@ static int synaptics_rmi4_i2c_query_device(struct synaptics_rmi4_data *pdata) "%s:end of PDT\n", __func__); break; } + switch (rmi_fd.fn_number & MASK_8BIT) { + case SYNAPTICS_RMI4_DEVICE_CONTROL_FUNC_NUM: + pdata->fn01_query_base_addr = + rmi_fd.query_base_addr; + pdata->fn01_ctrl_base_addr = + rmi_fd.ctrl_base_addr; + pdata->fn01_data_base_addr = + rmi_fd.data_base_addr; + break; + case SYNAPTICS_RMI4_TOUCHSCREEN_FUNC_NUM: + if (rmi_fd.intr_src_count) { + rfi = kmalloc(sizeof(*rfi), GFP_KERNEL); + if (!rfi) { + dev_err(&client->dev, + "%s:kmalloc failed\n", + __func__); + return -ENOMEM; + } + retval = synpatics_rmi4_touchscreen_detect( + pdata, rfi, &rmi_fd, + intr_count); + if (retval < 0) { + kfree(rfi); + return retval; + } + } + break; + } + /* interrupt count for next iteration */ + intr_count += (rmi_fd.intr_src_count & MASK_3BIT); + /* + * We only want to add functions to the list + * that have data associated with them. + */ + if (rfi && rmi_fd.intr_src_count) { + /* link this function info to the RMI module */ + mutex_lock(&(pdata->fn_list_mutex)); + list_add_tail(&rfi->link, + &pdata->rmi4_mod_info.support_fn_list); + mutex_unlock(&(pdata->fn_list_mutex)); + } } /* * calculate the interrupt register count - used in the @@ -849,33 +835,28 @@ static int synaptics_rmi4_i2c_query_device(struct synaptics_rmi4_data *pdata) list_for_each_entry(rfi, &pdata->rmi4_mod_info.support_fn_list, link) data_sources += rfi->num_of_data_sources; - if (data_sources) { - rmi = &(pdata->rmi4_mod_info); - list_for_each_entry(rfi, &rmi->support_fn_list, link) { - if (rfi->num_of_data_sources) { - if (rfi->fn_number == - SYNAPTICS_RMI4_TOUCHPAD_FUNC_NUM) { - retval = synaptics_rmi4_touchpad_config - (pdata, rfi); - if (retval < 0) - return retval; - } else - dev_err(&client->dev, - "%s:fn_number not supported\n", + if (!data_sources) + return 0; + rmi = &(pdata->rmi4_mod_info); + list_for_each_entry(rfi, &rmi->support_fn_list, link) { + if (!rfi->num_of_data_sources) + continue; + if (rfi->fn_number == SYNAPTICS_RMI4_TOUCHSCREEN_FUNC_NUM) { + retval = synaptics_rmi4_touchscreen_config(pdata, rfi); + if (retval < 0) + return retval; + } else + dev_err(&client->dev, "%s:fn_number not supported\n", __func__); - /* - * Turn on interrupts for this - * function's data sources. - */ - ctrl_offset = pdata->fn01_ctrl_base_addr + 1 + - rfi->index_to_intr_reg; - retval = synaptics_rmi4_i2c_byte_write(pdata, - ctrl_offset, + /* + * Turn on interrupts for this function's data sources. + */ + ctrl_offset = pdata->fn01_ctrl_base_addr + 1 + + rfi->index_to_intr_reg; + retval = synaptics_rmi4_i2c_byte_write(pdata, ctrl_offset, rfi->intr_mask); - if (retval < 0) - return retval; - } - } + if (retval < 0) + return retval; } return 0; } @@ -988,6 +969,8 @@ static int __devinit synaptics_rmi4_probe rmi4_data->sensor_max_y, 0, 0); input_set_abs_params(rmi4_data->input_dev, ABS_MT_TOUCH_MAJOR, 0, MAX_TOUCH_MAJOR, 0, 0); + input_mt_init_slots(rmi4_data->input_dev, + rmi4_data->fingers_supported, INPUT_MT_DIRECT); /* Clear interrupts */ synaptics_rmi4_i2c_block_read(rmi4_data, @@ -1076,7 +1059,7 @@ static int synaptics_rmi4_suspend(struct device *dev) retval = synaptics_rmi4_i2c_byte_write(rmi4_data, rmi4_data->fn01_ctrl_base_addr + 1, - (intr_status & ~TOUCHPAD_CTRL_INTR)); + (intr_status & ~TOUCHSCREEN_CTRL_INTR)); if (retval < 0) return retval; @@ -1112,7 +1095,7 @@ static int synaptics_rmi4_resume(struct device *dev) retval = synaptics_rmi4_i2c_byte_write(rmi4_data, rmi4_data->fn01_ctrl_base_addr + 1, - (intr_status | TOUCHPAD_CTRL_INTR)); + (intr_status | TOUCHSCREEN_CTRL_INTR)); if (retval < 0) return retval; -- 1.7.5.4 -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html