Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbd89ef4 authored by Alexandra Chin's avatar Alexandra Chin Committed by Abinaya P
Browse files

input: synaptics_i2c_rmi4: add flipx and flipy to sysfs 

- modify enable irq function
- fix F$34 issue of interrupt dispatch
- add pressure report
- add sysfs entry flipx/flipy

Change-Id: I648184496639241c45528c6b806b0ae97bc7a555
Git-commit: 3f6a24d9e9af0f5ba229910225637c081255cdc3
Git-repo: git://github.com/synaptics-touch/synaptics-dsx-i2c.git


[amaloche@codeaurora.org: Removed unnecessary parts of patch]
Signed-off-by: default avatarAmy Maloche <amaloche@codeaurora.org>
Signed-off-by: default avatarAbinaya P <abinayap@codeaurora.org>
parent 817a164b

drivers/input/touchscreen/synaptics_i2c_rmi4.c

+108 −20
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ 


#define NORMAL_OPERATION (0 << 0)

#define SENSOR_SLEEP (1 << 0)

#define NO_SLEEP_OFF (0 << 3)

#define NO_SLEEP_ON (1 << 3)

#define NO_SLEEP_OFF (0 << 2)

#define NO_SLEEP_ON (1 << 2)



#define RMI4_VTG_MIN_UV		2700000

#define RMI4_VTG_MAX_UV		3300000
@@ -125,6 +125,19 @@ static ssize_t synaptics_rmi4_0dbutton_show(struct device *dev, 
static ssize_t synaptics_rmi4_0dbutton_store(struct device *dev,

		struct device_attribute *attr, const char *buf, size_t count);



static ssize_t synaptics_rmi4_flipx_show(struct device *dev,

		struct device_attribute *attr, char *buf);



static ssize_t synaptics_rmi4_flipx_store(struct device *dev,

		struct device_attribute *attr, const char *buf, size_t count);



static ssize_t synaptics_rmi4_flipy_show(struct device *dev,

		struct device_attribute *attr, char *buf);



static ssize_t synaptics_rmi4_flipy_store(struct device *dev,

		struct device_attribute *attr, const char *buf, size_t count);





struct synaptics_rmi4_f01_device_status {

	union {

		struct {
@@ -223,6 +236,12 @@ static struct device_attribute attrs[] = { 
	__ATTR(0dbutton, (S_IRUGO | S_IWUSR | S_IWGRP),

			synaptics_rmi4_0dbutton_show,

			synaptics_rmi4_0dbutton_store),

	__ATTR(flipx, (S_IRUGO | S_IWUGO),

			synaptics_rmi4_flipx_show,

			synaptics_rmi4_flipx_store),

	__ATTR(flipy, (S_IRUGO | S_IWUGO),

			synaptics_rmi4_flipy_show,

			synaptics_rmi4_flipy_store),

};



static bool exp_fn_inited;
@@ -395,6 +414,52 @@ static ssize_t synaptics_rmi4_0dbutton_store(struct device *dev, 
	return count;

}



static ssize_t synaptics_rmi4_flipx_show(struct device *dev,

	struct device_attribute *attr, char *buf)

{

	struct synaptics_rmi4_data *rmi4_data = dev_get_drvdata(dev);



	return snprintf(buf, PAGE_SIZE, "%u\n",

		rmi4_data->flip_x);

}



static ssize_t synaptics_rmi4_flipx_store(struct device *dev,

	struct device_attribute *attr, const char *buf, size_t count)

{

	unsigned int input;

	struct synaptics_rmi4_data *rmi4_data = dev_get_drvdata(dev);



	if (sscanf(buf, "%u", &input) != 1)

		return -EINVAL;



	rmi4_data->flip_x = input > 0 ? 1 : 0;



	return count;

}



static ssize_t synaptics_rmi4_flipy_show(struct device *dev,

	struct device_attribute *attr, char *buf)

{

	struct synaptics_rmi4_data *rmi4_data = dev_get_drvdata(dev);



	return snprintf(buf, PAGE_SIZE, "%u\n",

		rmi4_data->flip_y);

}



static ssize_t synaptics_rmi4_flipy_store(struct device *dev,

	struct device_attribute *attr, const char *buf, size_t count)

{

	unsigned int input;

	struct synaptics_rmi4_data *rmi4_data = dev_get_drvdata(dev);



	if (sscanf(buf, "%u", &input) != 1)

		return -EINVAL;



	rmi4_data->flip_y = input > 0 ? 1 : 0;



	return count;

}



 /**

 * synaptics_rmi4_set_page()

 *
@@ -585,6 +650,7 @@ static int synaptics_rmi4_f11_abs_report(struct synaptics_rmi4_data *rmi4_data, 
	int y;

	int wx;

	int wy;

	int z;



	/*

	 * The number of finger status registers is determined by the
@@ -638,10 +704,11 @@ static int synaptics_rmi4_f11_abs_report(struct synaptics_rmi4_data *rmi4_data, 
			y = (data[1] << 4) | ((data[2] >> 4) & MASK_4BIT);

			wx = (data[3] & MASK_4BIT);

			wy = (data[3] >> 4) & MASK_4BIT;

			z = data[4];



			if (rmi4_data->board->x_flip)

			if (rmi4_data->flip_x)

				x = rmi4_data->sensor_max_x - x;

			if (rmi4_data->board->y_flip)

			if (rmi4_data->flip_y)

				y = rmi4_data->sensor_max_y - y;



			dev_dbg(&rmi4_data->i2c_client->dev,
@@ -659,6 +726,8 @@ static int synaptics_rmi4_f11_abs_report(struct synaptics_rmi4_data *rmi4_data, 
					ABS_MT_POSITION_X, x);

			input_report_abs(rmi4_data->input_dev,

					ABS_MT_POSITION_Y, y);

			input_report_abs(rmi4_data->input_dev,

					ABS_MT_PRESSURE, z);



#ifdef REPORT_2D_W

			input_report_abs(rmi4_data->input_dev,
@@ -1007,22 +1076,12 @@ static int synaptics_rmi4_irq_enable(struct synaptics_rmi4_data *rmi4_data, 
		if (retval < 0)

			return retval;



		retval = request_threaded_irq(rmi4_data->irq, NULL,

				synaptics_rmi4_irq,

				rmi4_data->board->irq_flags,

				DRIVER_NAME, rmi4_data);

		if (retval < 0) {

			dev_err(&rmi4_data->i2c_client->dev,

					"%s: Failed to create irq thread\n",

					__func__);

			return retval;

		}

		enable_irq(rmi4_data->irq);



		rmi4_data->irq_enabled = true;

	} else {

		if (rmi4_data->irq_enabled) {

			disable_irq(rmi4_data->irq);

			free_irq(rmi4_data->irq, rmi4_data);

			rmi4_data->irq_enabled = false;

		}

	}
@@ -1241,7 +1300,7 @@ error_exit: 
static int synaptics_rmi4_alloc_fh(struct synaptics_rmi4_fn **fhandler,

		struct synaptics_rmi4_fn_desc *rmi_fd, int page_number)

{

	*fhandler = kmalloc(sizeof(**fhandler), GFP_KERNEL);

	*fhandler = kzalloc(sizeof(**fhandler), GFP_KERNEL);

	if (!(*fhandler))

		return -ENOMEM;
@@ -1257,6 +1316,7 @@ static int synaptics_rmi4_alloc_fh(struct synaptics_rmi4_fn **fhandler, 
	(*fhandler)->full_addr.query_base =

			(rmi_fd->query_base_addr |

			(page_number << 8));

	(*fhandler)->fn_number = rmi_fd->fn_number;



	return 0;

}
@@ -1315,7 +1375,7 @@ static int synaptics_rmi4_query_device_info( 
				__func__, retval);

		return retval;

	}

	return retval;

	return 0;

}



 /**
@@ -1408,6 +1468,18 @@ static int synaptics_rmi4_query_device(struct synaptics_rmi4_data *rmi4_data) 
				break;



			case SYNAPTICS_RMI4_F34:

				if (rmi_fd.intr_src_count == 0)

					break;



				retval = synaptics_rmi4_alloc_fh(&fhandler,

					&rmi_fd, page_number);

				if (retval < 0) {

					dev_err(&rmi4_data->i2c_client->dev,

					"%s: Failed to alloc for F%d\n",

					__func__,

					rmi_fd.fn_number);

					return retval;

				}

				retval = synaptics_rmi4_i2c_read(rmi4_data,

						rmi_fd.ctrl_base_addr,

						rmi->config_id,
@@ -1895,6 +1967,9 @@ static int synaptics_rmi4_probe(struct i2c_client *client, 
	rmi4_data->irq_enable = synaptics_rmi4_irq_enable;

	rmi4_data->reset_device = synaptics_rmi4_reset_device;



	rmi4_data->flip_x = rmi4_data->board->x_flip;

	rmi4_data->flip_y = rmi4_data->board->y_flip;



	rmi4_data->input_dev->name = DRIVER_NAME;

	rmi4_data->input_dev->phys = INPUT_PHYS_NAME;

	rmi4_data->input_dev->id.bustype = BUS_I2C;
@@ -1987,6 +2062,8 @@ static int synaptics_rmi4_probe(struct i2c_client *client, 
	input_set_abs_params(rmi4_data->input_dev,

			ABS_MT_POSITION_Y, 0,

			rmi4_data->sensor_max_y, 0, 0);

	input_set_abs_params(rmi4_data->input_dev,

			ABS_PRESSURE, 0, 255, 0, 0);

#ifdef REPORT_2D_W

	input_set_abs_params(rmi4_data->input_dev,

			ABS_MT_TOUCH_MAJOR, 0,
@@ -2048,10 +2125,14 @@ static int synaptics_rmi4_probe(struct i2c_client *client, 


	rmi4_data->irq = gpio_to_irq(platform_data->irq_gpio);



	retval = synaptics_rmi4_irq_enable(rmi4_data, true);

	retval = request_threaded_irq(rmi4_data->irq, NULL,

		synaptics_rmi4_irq, platform_data->irq_flags,

		DRIVER_NAME, rmi4_data);

	rmi4_data->irq_enabled = true;



	if (retval < 0) {

		dev_err(&client->dev,

				"%s: Failed to enable attention interrupt\n",

				"%s: Failed to create irq thread\n",

				__func__);

		goto err_enable_irq;

	}
@@ -2066,6 +2147,13 @@ static int synaptics_rmi4_probe(struct i2c_client *client, 
			goto err_sysfs;

		}

	}

	retval = synaptics_rmi4_irq_enable(rmi4_data, true);

	if (retval < 0) {

		dev_err(&client->dev,

			"%s: Failed to enable attention interrupt\n",

			__func__);

		goto err_sysfs;

	}



	return retval;
@@ -2136,7 +2224,7 @@ static int synaptics_rmi4_remove(struct i2c_client *client) 
	rmi4_data->touch_stopped = true;

	wake_up(&rmi4_data->wait);



	synaptics_rmi4_irq_enable(rmi4_data, false);

	free_irq(rmi4_data->irq, rmi4_data);



	for (attr_count = 0; attr_count < ARRAY_SIZE(attrs); attr_count++) {

		sysfs_remove_file(&rmi4_data->input_dev->dev.kobj,

drivers/input/touchscreen/synaptics_i2c_rmi4.h

+4 −0
Original line number Diff line number Diff line
@@ -177,6 +177,8 @@ struct synaptics_rmi4_device_info { 
 * @irq_enabled: flag for indicating interrupt enable status

 * @touch_stopped: flag to stop interrupt thread processing

 * @fingers_on_2d: flag to indicate presence of fingers in 2d area

 * @flip_x: set to TRUE if desired to flip direction on x-axis

 * @flip_y: set to TRUE if desired to flip direction on y-axis

 * @sensor_sleep: flag to indicate sleep state of sensor

 * @wait: wait queue for touch data polling in interrupt thread

 * @i2c_read: pointer to i2c read function
@@ -215,6 +217,8 @@ struct synaptics_rmi4_data { 
	bool touch_stopped;

	bool fingers_on_2d;

	bool sensor_sleep;

	bool flip_x;

	bool flip_y;

	wait_queue_head_t wait;

	int (*i2c_read)(struct synaptics_rmi4_data *pdata, unsigned short addr,

			unsigned char *data, unsigned short length);