Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1592687

[PATCH] Input: elan_i2c - add ASUS EeeBook X205TA special touchpad fw

Show all headers | View raw

EeeBook X205TA is yet another ASUS device with a special touchpad
firmware that needs to be accounted for during initialization, or
else the touchpad will go into an invalid state upon suspend/resume.
Adding the appropriate ic_type and product_id check fixes the problem.

Signed-off-by: Matjaz Hegedic <matjaz.hegedic@gmail.com>
---
 drivers/input/mouse/elan_i2c_core.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
index 2c7d287..dde3ad7 100644
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -218,17 +218,19 @@ static int elan_query_product(struct elan_tp_data *data)
 
 static int elan_check_ASUS_special_fw(struct elan_tp_data *data)
 {
-	if (data->ic_type != 0x0E)
-		return false;
-
-	switch (data->product_id) {
-	case 0x05 ... 0x07:
-	case 0x09:
-	case 0x13:
-		return true;
-	default:
-		return false;
+	if (data->ic_type == 0x0E) {
+		switch (data->product_id) {
+		case 0x05 ... 0x07:
+		case 0x09:
+		case 0x13:
+			return true;
+		}
 	}
+	/* ASUS EeeBook X205TA */
+	else if (data->ic_type == 0x8 && data->product_id == 0x26)
+		return true;
+
+	return false;
 }
 
 static int __elan_initialize(struct elan_tp_data *data)
-- 
2.7.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] Input: elan_i2c - add ASUS EeeBook X205TA special touchpad fw Matjaz Hegedic <matjaz.hegedic@gmail.com> - 2017-03-05 03:20 +0100
  Re: [PATCH] Input: elan_i2c - add ASUS EeeBook X205TA special  touchpad fw Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-03-06 21:00 +0100
    RE: [PATCH] Input: elan_i2c - add ASUS EeeBook X205TA special touchpad fw 廖崇榮 <kt.liao@emc.com.tw> - 2017-03-07 08:50 +0100
      Re: [PATCH] Input: elan_i2c - add ASUS EeeBook X205TA special  touchpad fw Matjaž Hegedič <matjaz.hegedic@gmail.com> - 2017-03-07 12:00 +0100
        RE: [PATCH] Input: elan_i2c - add ASUS EeeBook X205TA special touchpad fw 廖崇榮 <kt.liao@emc.com.tw> - 2017-03-08 07:40 +0100
          Re: [PATCH] Input: elan_i2c - add ASUS EeeBook X205TA special  touchpad fw 'Dmitry Torokhov' <dmitry.torokhov@gmail.com> - 2017-03-10 23:40 +0100

csiph-web