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

Commit ed75a14e authored by Duson Lin's avatar Duson Lin Committed by Dmitry Torokhov
Browse files

Input: elan_i2c - expand maximum product_id form 0xFF to 0xFFFF 



In order to support more projects in the future, we expand the
maximum product_id value form 0xFF to 0xFFFF.

Signed-off by: Duson Lin <dusonlin@emc.com.tw>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent c84333a1

drivers/input/mouse/elan_i2c.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ struct elan_transport_ops { 
	int (*get_sm_version)(struct i2c_client *client,

			      u8* ic_type, u8 *version);

	int (*get_checksum)(struct i2c_client *client, bool iap, u16 *csum);

	int (*get_product_id)(struct i2c_client *client, u8 *id);

	int (*get_product_id)(struct i2c_client *client, u16 *id);



	int (*get_max)(struct i2c_client *client,

		       unsigned int *max_x, unsigned int *max_y);

drivers/input/mouse/elan_i2c_core.c

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include "elan_i2c.h"



#define DRIVER_NAME		"elan_i2c"

#define ELAN_DRIVER_VERSION	"1.6.0"

#define ELAN_DRIVER_VERSION	"1.6.1"

#define ETP_MAX_PRESSURE	255

#define ETP_FWIDTH_REDUCE	90

#define ETP_FINGER_WIDTH	15
@@ -76,7 +76,7 @@ struct elan_tp_data { 
	unsigned int		x_res;

	unsigned int		y_res;



	u8			product_id;

	u16			product_id;

	u8			fw_version;

	u8			sm_version;

	u8			iap_version;

drivers/input/mouse/elan_i2c_i2c.c

+2 −2
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static int elan_i2c_get_sm_version(struct i2c_client *client, 
	return 0;

}



static int elan_i2c_get_product_id(struct i2c_client *client, u8 *id)

static int elan_i2c_get_product_id(struct i2c_client *client, u16 *id)

{

	int error;

	u8 val[3];
@@ -287,7 +287,7 @@ static int elan_i2c_get_product_id(struct i2c_client *client, u8 *id) 
		return error;

	}



	*id = val[0];

	*id = le16_to_cpup((__le16 *)val);

	return 0;

}

drivers/input/mouse/elan_i2c_smbus.c

+2 −2
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static int elan_smbus_get_sm_version(struct i2c_client *client, 
	return 0;

}



static int elan_smbus_get_product_id(struct i2c_client *client, u8 *id)

static int elan_smbus_get_product_id(struct i2c_client *client, u16 *id)

{

	int error;

	u8 val[3];
@@ -195,7 +195,7 @@ static int elan_smbus_get_product_id(struct i2c_client *client, u8 *id) 
		return error;

	}



	*id = val[1];

	*id = be16_to_cpup((__be16 *)val);

	return 0;

}