|
@@ -4,7 +4,8 @@
|
|
|
* Copyright (c) 2013 ELAN Microelectronics Corp.
|
|
|
*
|
|
|
* Author: 林政維 (Duson Lin) <dusonlin@emc.com.tw>
|
|
|
- * Version: 1.6.0
|
|
|
+ * Author: KT Liao <kt.liao@emc.com.tw>
|
|
|
+ * Version: 1.6.2
|
|
|
*
|
|
|
* Based on cyapa driver:
|
|
|
* copyright (c) 2011-2012 Cypress Semiconductor, Inc.
|
|
@@ -40,7 +41,7 @@
|
|
|
#include "elan_i2c.h"
|
|
|
|
|
|
#define DRIVER_NAME "elan_i2c"
|
|
|
-#define ELAN_DRIVER_VERSION "1.6.1"
|
|
|
+#define ELAN_DRIVER_VERSION "1.6.2"
|
|
|
#define ELAN_VENDOR_ID 0x04f3
|
|
|
#define ETP_MAX_PRESSURE 255
|
|
|
#define ETP_FWIDTH_REDUCE 90
|
|
@@ -199,9 +200,41 @@ static int elan_sleep(struct elan_tp_data *data)
|
|
|
return error;
|
|
|
}
|
|
|
|
|
|
+static int elan_query_product(struct elan_tp_data *data)
|
|
|
+{
|
|
|
+ int error;
|
|
|
+
|
|
|
+ error = data->ops->get_product_id(data->client, &data->product_id);
|
|
|
+ if (error)
|
|
|
+ return error;
|
|
|
+
|
|
|
+ error = data->ops->get_sm_version(data->client, &data->ic_type,
|
|
|
+ &data->sm_version);
|
|
|
+ if (error)
|
|
|
+ return error;
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+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;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
static int __elan_initialize(struct elan_tp_data *data)
|
|
|
{
|
|
|
struct i2c_client *client = data->client;
|
|
|
+ bool woken_up = false;
|
|
|
int error;
|
|
|
|
|
|
error = data->ops->initialize(client);
|
|
@@ -210,6 +243,27 @@ static int __elan_initialize(struct elan_tp_data *data)
|
|
|
return error;
|
|
|
}
|
|
|
|
|
|
+ error = elan_query_product(data);
|
|
|
+ if (error)
|
|
|
+ return error;
|
|
|
+
|
|
|
+ /*
|
|
|
+ * Some ASUS devices were shipped with firmware that requires
|
|
|
+ * touchpads to be woken up first, before attempting to switch
|
|
|
+ * them into absolute reporting mode.
|
|
|
+ */
|
|
|
+ if (elan_check_ASUS_special_fw(data)) {
|
|
|
+ error = data->ops->sleep_control(client, false);
|
|
|
+ if (error) {
|
|
|
+ dev_err(&client->dev,
|
|
|
+ "failed to wake device up: %d\n", error);
|
|
|
+ return error;
|
|
|
+ }
|
|
|
+
|
|
|
+ msleep(200);
|
|
|
+ woken_up = true;
|
|
|
+ }
|
|
|
+
|
|
|
data->mode |= ETP_ENABLE_ABS;
|
|
|
error = data->ops->set_mode(client, data->mode);
|
|
|
if (error) {
|
|
@@ -218,11 +272,13 @@ static int __elan_initialize(struct elan_tp_data *data)
|
|
|
return error;
|
|
|
}
|
|
|
|
|
|
- error = data->ops->sleep_control(client, false);
|
|
|
- if (error) {
|
|
|
- dev_err(&client->dev,
|
|
|
- "failed to wake device up: %d\n", error);
|
|
|
- return error;
|
|
|
+ if (!woken_up) {
|
|
|
+ error = data->ops->sleep_control(client, false);
|
|
|
+ if (error) {
|
|
|
+ dev_err(&client->dev,
|
|
|
+ "failed to wake device up: %d\n", error);
|
|
|
+ return error;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
return 0;
|
|
@@ -248,10 +304,6 @@ static int elan_query_device_info(struct elan_tp_data *data)
|
|
|
{
|
|
|
int error;
|
|
|
|
|
|
- error = data->ops->get_product_id(data->client, &data->product_id);
|
|
|
- if (error)
|
|
|
- return error;
|
|
|
-
|
|
|
error = data->ops->get_version(data->client, false, &data->fw_version);
|
|
|
if (error)
|
|
|
return error;
|
|
@@ -261,11 +313,6 @@ static int elan_query_device_info(struct elan_tp_data *data)
|
|
|
if (error)
|
|
|
return error;
|
|
|
|
|
|
- error = data->ops->get_sm_version(data->client, &data->ic_type,
|
|
|
- &data->sm_version);
|
|
|
- if (error)
|
|
|
- return error;
|
|
|
-
|
|
|
error = data->ops->get_version(data->client, true, &data->iap_version);
|
|
|
if (error)
|
|
|
return error;
|