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

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

input: synaptics: driver updates 



 - remove module detection thread queue
 - update driver version check

This patch is a propagated patch from 3.4 kernel
commit - 5d2999db3a91b1820e15ad249f404db2d290f3d3,
input: synaptics: driver updates

Change-Id: Id2ccdcc99c4484a94a4945c4e1e51066b67c1529
[amaloche@codeaurora.org: Added subject line]
Signed-off-by: default avatarAmy Maloche <amaloche@codeaurora.org>
Signed-off-by: default avatarAbinaya P <abinayap@codeaurora.org>
parent 6c85b82f

drivers/input/touchscreen/synaptics_i2c_rmi4.c

+2 −6
Original line number Diff line number Diff line
@@ -1492,10 +1492,6 @@ static void synaptics_rmi4_detection_work(struct work_struct *work) 
			container_of(work, struct synaptics_rmi4_data,

			det_work.work);



	queue_delayed_work(rmi4_data->det_workqueue,

			&rmi4_data->det_work,

			msecs_to_jiffies(EXP_FN_DET_INTERVAL));



	mutex_lock(&exp_fn_list_mutex);

	if (!list_empty(&exp_fn_list)) {

		list_for_each_entry_safe(exp_fhandler,
@@ -1671,8 +1667,8 @@ static int synaptics_rmi4_probe(struct i2c_client *client, 
	rmi4_data->input_dev->name = DRIVER_NAME;

	rmi4_data->input_dev->phys = INPUT_PHYS_NAME;

	rmi4_data->input_dev->id.bustype = BUS_I2C;

	rmi4_data->input_dev->id.product = SYNAPTICS_RMI4_DRIVER_PRODUCT;

	rmi4_data->input_dev->id.version = SYNAPTICS_RMI4_DRIVER_VERSION;

	rmi4_data->input_dev->id.product = SYNAPTICS_DSX_DRIVER_PRODUCT;

	rmi4_data->input_dev->id.version = SYNAPTICS_DSX_DRIVER_VERSION;

	rmi4_data->input_dev->dev.parent = &client->dev;

	input_set_drvdata(rmi4_data->input_dev, rmi4_data);

drivers/input/touchscreen/synaptics_i2c_rmi4.h

+4 −4
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ 
#ifndef _SYNAPTICS_DSX_RMI4_H_

#define _SYNAPTICS_DSX_RMI4_H_



#define SYNAPTICS_RMI4_DS4 0x0001

#define SYNAPTICS_RMI4_DS5 0x0002

#define SYNAPTICS_RMI4_DRIVER_PRODUCT SYNAPTICS_RMI4_DS4

#define SYNAPTICS_RMI4_DRIVER_VERSION 0x1001

#define SYNAPTICS_DS4 (1 << 0)

#define SYNAPTICS_DS5 (1 << 1)

#define SYNAPTICS_DSX_DRIVER_PRODUCT SYNAPTICS_DS4

#define SYNAPTICS_DSX_DRIVER_VERSION 0x1001



#include <linux/version.h>

#ifdef CONFIG_HAS_EARLYSUSPEND