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

Commit 0044cdeb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

Pull input fixes from Dmitry Torokhov:
 "We are switching a bunch of Lenovo devices with Synaptics touchpads
  from PS/2 emulation over to native RMI/SMbus.

  Given that all commits are marked for stable there is no point
  delaying them till next release"

[ Also fix a too-small stack array for i2c communication in elan driver ]

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: elan_i2c_smbus - fix corrupted stack
  Input: synaptics - add Lenovo 80 series ids to SMBus
  Input: synaptics - add Intertouch support on X1 Carbon 6th and X280
  Input: synaptics - Lenovo Thinkpad X1 Carbon G5 (2017) with Elantech trackpoints should use RMI
  Input: synaptics - Lenovo Carbon X1 Gen5 (2017) devices should use RMI
parents 91fc957a 40f7090b

drivers/input/mouse/elan_i2c_smbus.c

+11 −11
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static int elan_smbus_get_baseline_data(struct i2c_client *client, 
					bool max_baseline, u8 *value)

{

	int error;

	u8 val[3];

	u8 val[I2C_SMBUS_BLOCK_MAX] = {0};



	error = i2c_smbus_read_block_data(client,

					  max_baseline ?
@@ -149,7 +149,7 @@ static int elan_smbus_get_version(struct i2c_client *client, 
				  bool iap, u8 *version)

{

	int error;

	u8 val[3];

	u8 val[I2C_SMBUS_BLOCK_MAX] = {0};



	error = i2c_smbus_read_block_data(client,

					  iap ? ETP_SMBUS_IAP_VERSION_CMD :
@@ -170,7 +170,7 @@ static int elan_smbus_get_sm_version(struct i2c_client *client, 
				     u8 *clickpad)

{

	int error;

	u8 val[3];

	u8 val[I2C_SMBUS_BLOCK_MAX] = {0};



	error = i2c_smbus_read_block_data(client,

					  ETP_SMBUS_SM_VERSION_CMD, val);
@@ -188,7 +188,7 @@ static int elan_smbus_get_sm_version(struct i2c_client *client, 
static int elan_smbus_get_product_id(struct i2c_client *client, u16 *id)

{

	int error;

	u8 val[3];

	u8 val[I2C_SMBUS_BLOCK_MAX] = {0};



	error = i2c_smbus_read_block_data(client,

					  ETP_SMBUS_UNIQUEID_CMD, val);
@@ -205,7 +205,7 @@ static int elan_smbus_get_checksum(struct i2c_client *client, 
				   bool iap, u16 *csum)

{

	int error;

	u8 val[3];

	u8 val[I2C_SMBUS_BLOCK_MAX] = {0};



	error = i2c_smbus_read_block_data(client,

					  iap ? ETP_SMBUS_FW_CHECKSUM_CMD :
@@ -226,7 +226,7 @@ static int elan_smbus_get_max(struct i2c_client *client, 
{

	int ret;

	int error;

	u8 val[3];

	u8 val[I2C_SMBUS_BLOCK_MAX] = {0};



	ret = i2c_smbus_read_block_data(client, ETP_SMBUS_RANGE_CMD, val);

	if (ret != 3) {
@@ -246,7 +246,7 @@ static int elan_smbus_get_resolution(struct i2c_client *client, 
{

	int ret;

	int error;

	u8 val[3];

	u8 val[I2C_SMBUS_BLOCK_MAX] = {0};



	ret = i2c_smbus_read_block_data(client, ETP_SMBUS_RESOLUTION_CMD, val);

	if (ret != 3) {
@@ -267,7 +267,7 @@ static int elan_smbus_get_num_traces(struct i2c_client *client, 
{

	int ret;

	int error;

	u8 val[3];

	u8 val[I2C_SMBUS_BLOCK_MAX] = {0};



	ret = i2c_smbus_read_block_data(client, ETP_SMBUS_XY_TRACENUM_CMD, val);

	if (ret != 3) {
@@ -294,7 +294,7 @@ static int elan_smbus_iap_get_mode(struct i2c_client *client, 
{

	int error;

	u16 constant;

	u8 val[3];

	u8 val[I2C_SMBUS_BLOCK_MAX] = {0};



	error = i2c_smbus_read_block_data(client, ETP_SMBUS_IAP_CTRL_CMD, val);

	if (error < 0) {
@@ -345,7 +345,7 @@ static int elan_smbus_prepare_fw_update(struct i2c_client *client) 
	int len;

	int error;

	enum tp_mode mode;

	u8 val[3];

	u8 val[I2C_SMBUS_BLOCK_MAX] = {0};

	u8 cmd[4] = {0x0F, 0x78, 0x00, 0x06};

	u16 password;
@@ -419,7 +419,7 @@ static int elan_smbus_write_fw_block(struct i2c_client *client, 
	struct device *dev = &client->dev;

	int error;

	u16 result;

	u8 val[3];

	u8 val[I2C_SMBUS_BLOCK_MAX] = {0};



	/*

	 * Due to the limitation of smbus protocol limiting

drivers/input/mouse/synaptics.c

+6 −0
Original line number Diff line number Diff line
@@ -172,6 +172,12 @@ static const char * const smbus_pnp_ids[] = { 
	"LEN0048", /* X1 Carbon 3 */

	"LEN0046", /* X250 */

	"LEN004a", /* W541 */

	"LEN0071", /* T480 */

	"LEN0072", /* X1 Carbon Gen 5 (2017) - Elan/ALPS trackpoint */

	"LEN0073", /* X1 Carbon G5 (Elantech) */

	"LEN0092", /* X1 Carbon 6 */

	"LEN0096", /* X280 */

	"LEN0097", /* X280 -> ALPS trackpoint */

	"LEN200f", /* T450s */

	NULL

};