Commit d5ebe37e authored by HungNien Chen's avatar HungNien Chen Committed by Dmitry Torokhov
Browse files

Input: wdt87xx_i2c - populate vendor and product in input device 



These attributes can be used to identify controllers present in the system.

Signed-off-by: default avatarHungNien Chen <hn.chen@weidahitech.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent d48259a0

drivers/input/touchscreen/wdt87xx_i2c.c

+45 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <asm/unaligned.h>



#define WDT87XX_NAME		"wdt87xx_i2c"

#define WDT87XX_DRV_VER		"0.9.6"

#define WDT87XX_DRV_VER		"0.9.7"

#define WDT87XX_FW_NAME		"wdt87xx_fw.bin"

#define WDT87XX_CFG_NAME	"wdt87xx_cfg.bin"
@@ -85,6 +85,11 @@ 
#define CTL_PARAM_OFFSET_PHY_H		24

#define CTL_PARAM_OFFSET_FACTOR		32



/* The definition of the device descriptor */

#define WDT_GD_DEVICE			1

#define DEV_DESC_OFFSET_VID		8

#define DEV_DESC_OFFSET_PID		10



/* Communication commands */

#define PACKET_SIZE			56

#define VND_REQ_READ			0x06
@@ -165,6 +170,8 @@ struct wdt87xx_sys_param { 
	u16	scaling_factor;

	u32	max_x;

	u32	max_y;

	u16	vendor_id;

	u16	product_id;

};



struct wdt87xx_data {
@@ -208,6 +215,32 @@ static int wdt87xx_i2c_xfer(struct i2c_client *client, 
	return 0;

}



static int wdt87xx_get_desc(struct i2c_client *client, u8 desc_idx,

			    u8 *buf, size_t len)

{

	u8 tx_buf[] = { 0x22, 0x00, 0x10, 0x0E, 0x23, 0x00 };

	int error;



	tx_buf[2] |= desc_idx & 0xF;



	error = wdt87xx_i2c_xfer(client, tx_buf, sizeof(tx_buf),

				 buf, len);

	if (error) {

		dev_err(&client->dev, "get desc failed: %d\n", error);

		return error;

	}



	if (buf[0] != len) {

		dev_err(&client->dev, "unexpected response to get desc: %d\n",

			buf[0]);

		return -EINVAL;

	}



	mdelay(WDT_COMMAND_DELAY_MS);



	return 0;

}



static int wdt87xx_get_string(struct i2c_client *client, u8 str_idx,

			      u8 *buf, size_t len)

{
@@ -403,6 +436,15 @@ static int wdt87xx_get_sysparam(struct i2c_client *client, 
	u8 buf[PKT_READ_SIZE];

	int error;



	error = wdt87xx_get_desc(client, WDT_GD_DEVICE, buf, 18);

	if (error) {

		dev_err(&client->dev, "failed to get device desc\n");

		return error;

	}



	param->vendor_id = get_unaligned_le16(buf + DEV_DESC_OFFSET_VID);

	param->product_id = get_unaligned_le16(buf + DEV_DESC_OFFSET_PID);



	error = wdt87xx_get_string(client, STRIDX_PARAMETERS, buf, 34);

	if (error) {

		dev_err(&client->dev, "failed to get parameters\n");
@@ -994,6 +1036,8 @@ static int wdt87xx_ts_create_input_device(struct wdt87xx_data *wdt) 


	input->name = "WDT87xx Touchscreen";

	input->id.bustype = BUS_I2C;

	input->id.vendor = wdt->param.vendor_id;

	input->id.product = wdt->param.product_id;

	input->phys = wdt->phys;



	input_set_abs_params(input, ABS_MT_POSITION_X, 0,