From patchwork Thu Nov 17 11:47:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: KT Liao X-Patchwork-Id: 9434159 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 960CA6047D for ; Thu, 17 Nov 2016 11:47:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 85C3D29435 for ; Thu, 17 Nov 2016 11:47:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 79FE829437; Thu, 17 Nov 2016 11:47:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C658329435 for ; Thu, 17 Nov 2016 11:47:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2992443AbcKQLrC (ORCPT ); Thu, 17 Nov 2016 06:47:02 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:32935 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422629AbcKQLq7 (ORCPT ); Thu, 17 Nov 2016 06:46:59 -0500 Received: by mail-pf0-f194.google.com with SMTP id 144so11626389pfv.0; Thu, 17 Nov 2016 03:46:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Q3BQMN+gxZi+84SnOn/TToy3DhIm20rOclHFVOE+51I=; b=LMrjAP5ANFCqcv2JZo23dkUpgBMSjIuMXNCE6UfX+/IdpOyeKxQ7UhSmkClhq0Wlki s3a9hEW29JaxxUWm842N6TkyHv1MsnM5htzeB8XM3EQpfvtuLxt0J2J1/Kk1FCubohlc We8wEQNr5Ybh6R2FtD13mHi5dnOaVlkcQsuVLO4p3xb/FzupdpnhRQsWlyUAhnfQNeVJ KLWWKUaQQjzNzcvfMn/ev5yqokE0MmpQzX8/5myxcZwXNz0iHm4lICo85nUp84tCvoW9 wPzo9dhgvnaYYTOKZfjww6YCfRzDQ0HkGSzK9jOKAvSvrpHva7qtGyaFX80r0nSlo34V 6c2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Q3BQMN+gxZi+84SnOn/TToy3DhIm20rOclHFVOE+51I=; b=cTZTL5qPRRi2JU84QIx/MUnpsrbzhOuGnQ6RrPOzhr9T6Sf4LC9SXENjLKZ8K0naem n2IzcMphZvFvFb6BgK2WUT/87TSCtwLdVZdiW/r5Vj9qH/bSiTF2Y0tlDiamOZ9v+Q7L u/R4LFOWlZkoJKoEM331oJ26qTtDNwcmtQeIHHutvT+CqdNspcIXK8BPZwWhEj6ie60t /pGBmYmPXeUOxG/5BDO4Dj3adttuvYXzzM7oww/ukagyEzGrX4JwDQxi6nW65ECMobTr yR1AiiuNCnE+9E4YiLmAeqDSCqH92IslDqT5ykdYirR1eWDs9jGEQI0Og7IiS72sueDj D+SQ== X-Gm-Message-State: ABUngveNJqQn1lQhznpOS5uG7qdR0BpT5LqYAxEjGGE5yo/vPPB39PBRKRO8abNixCU73Q== X-Received: by 10.98.98.66 with SMTP id w63mr545465pfb.84.1479383218300; Thu, 17 Nov 2016 03:46:58 -0800 (PST) Received: from localhost.localdomain (114-136-61-154.EMOME-IP.hinet.net. [114.136.61.154]) by smtp.gmail.com with ESMTPSA id f23sm6727369pff.59.2016.11.17.03.46.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Nov 2016 03:46:57 -0800 (PST) From: KT Liao X-Google-Original-From: KT Liao To: linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, dmitry.torokhov@gmail.com Cc: phoenix@emc.com.tw, kt.liao@emc.com.tw Subject: [PATCH] Input: elan_i2c - Add new ic and modify some functions for new IC infomation Signed-off-by: KT Liao Date: Thu, 17 Nov 2016 19:47:43 +0800 Message-Id: <1479383263-34546-1-git-send-email-kt.liao@emc.com.tw> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP --- drivers/input/mouse/elan_i2c.h | 6 ++-- drivers/input/mouse/elan_i2c_core.c | 46 ++++++++++++++++++-------- drivers/input/mouse/elan_i2c_i2c.c | 63 ++++++++++++++++++++++++++++++------ drivers/input/mouse/elan_i2c_smbus.c | 11 +++++-- 4 files changed, 99 insertions(+), 27 deletions(-) mode change 100644 => 100755 drivers/input/mouse/elan_i2c.h mode change 100644 => 100755 drivers/input/mouse/elan_i2c_core.c mode change 100644 => 100755 drivers/input/mouse/elan_i2c_i2c.c mode change 100644 => 100755 drivers/input/mouse/elan_i2c_smbus.c diff --git a/drivers/input/mouse/elan_i2c.h b/drivers/input/mouse/elan_i2c.h old mode 100644 new mode 100755 index c0ec261..a90df14 --- a/drivers/input/mouse/elan_i2c.h +++ b/drivers/input/mouse/elan_i2c.h @@ -56,9 +56,10 @@ struct elan_transport_ops { int (*get_baseline_data)(struct i2c_client *client, bool max_baseliune, u8 *value); - int (*get_version)(struct i2c_client *client, bool iap, u8 *version); + int (*get_version)(struct i2c_client *client, + bool iap, u8 *version, u8 pattern); int (*get_sm_version)(struct i2c_client *client, - u8* ic_type, u8 *version); + u16 *ic_type, u8 *version, u8 pattern); int (*get_checksum)(struct i2c_client *client, bool iap, u16 *csum); int (*get_product_id)(struct i2c_client *client, u16 *id); @@ -82,6 +83,7 @@ struct elan_transport_ops { int (*get_report)(struct i2c_client *client, u8 *report); int (*get_pressure_adjustment)(struct i2c_client *client, int *adjustment); + int (*get_pattern)(struct i2c_client *client, u8 *pattern); }; extern const struct elan_transport_ops elan_smbus_ops, elan_i2c_ops; diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c old mode 100644 new mode 100755 index d15b338..bb0c832 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c @@ -5,7 +5,7 @@ * * Author: 林政維 (Duson Lin) * Author: KT Liao - * Version: 1.6.2 + * Version: 1.6.3 * * Based on cyapa driver: * copyright (c) 2011-2012 Cypress Semiconductor, Inc. @@ -41,7 +41,7 @@ #include "elan_i2c.h" #define DRIVER_NAME "elan_i2c" -#define ELAN_DRIVER_VERSION "1.6.2" +#define ELAN_DRIVER_VERSION "1.6.3" #define ELAN_VENDOR_ID 0x04f3 #define ETP_MAX_PRESSURE 255 #define ETP_FWIDTH_REDUCE 90 @@ -78,6 +78,7 @@ struct elan_tp_data { unsigned int x_res; unsigned int y_res; + u8 pattern; u16 product_id; u8 fw_version; u8 sm_version; @@ -85,7 +86,7 @@ struct elan_tp_data { u16 fw_checksum; int pressure_adjustment; u8 mode; - u8 ic_type; + u16 ic_type; u16 fw_validpage_count; u16 fw_signature_address; @@ -96,10 +97,10 @@ struct elan_tp_data { bool baseline_ready; }; -static int elan_get_fwinfo(u8 iap_version, u16 *validpage_count, +static int elan_get_fwinfo(u16 ic_type, u16 *validpage_count, u16 *signature_address) { - switch (iap_version) { + switch (ic_type) { case 0x00: case 0x06: case 0x08: @@ -119,6 +120,9 @@ static int elan_get_fwinfo(u8 iap_version, u16 *validpage_count, case 0x0E: *validpage_count = 640; break; + case 0x10: + *validpage_count = 1024; + break; default: /* unknown ic type clear value */ *validpage_count = 0; @@ -204,12 +208,17 @@ static int elan_query_product(struct elan_tp_data *data) { int error; + error = data->ops->get_pattern(data->client, &data->pattern); + if (error) + return 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); + &data->sm_version, data->pattern); + if (error) return error; @@ -302,9 +311,10 @@ static int elan_initialize(struct elan_tp_data *data) static int elan_query_device_info(struct elan_tp_data *data) { - int error; + int error, ic_type; - error = data->ops->get_version(data->client, false, &data->fw_version); + error = data->ops->get_version(data->client, false, &data->fw_version, + data->pattern); if (error) return error; @@ -313,16 +323,23 @@ static int elan_query_device_info(struct elan_tp_data *data) if (error) return error; - error = data->ops->get_version(data->client, true, &data->iap_version); + error = data->ops->get_version(data->client, true, &data->iap_version, + data->pattern); if (error) return error; + error = data->ops->get_pressure_adjustment(data->client, &data->pressure_adjustment); if (error) return error; - error = elan_get_fwinfo(data->iap_version, &data->fw_validpage_count, + if (data->pattern == 0x01) + ic_type = data->ic_type; + else + ic_type = data->iap_version; + + error = elan_get_fwinfo(ic_type, &data->fw_validpage_count, &data->fw_signature_address); if (error) dev_warn(&data->client->dev, @@ -1093,7 +1110,7 @@ static int elan_probe(struct i2c_client *client, if (error) return error; - dev_dbg(&client->dev, + dev_info(&client->dev, "Elan Touchpad Information:\n" " Module product ID: 0x%04x\n" " Firmware Version: 0x%04x\n" @@ -1101,14 +1118,17 @@ static int elan_probe(struct i2c_client *client, " IAP Version: 0x%04x\n" " Max ABS X,Y: %d,%d\n" " Width X,Y: %d,%d\n" - " Resolution X,Y: %d,%d (dots/mm)\n", + " Resolution X,Y: %d,%d (dots/mm)\n" + " ic type: 0x%x\n" + " info pattern: 0x%x\n", data->product_id, data->fw_version, data->sm_version, data->iap_version, data->max_x, data->max_y, data->width_x, data->width_y, - data->x_res, data->y_res); + data->x_res, data->y_res, + data->ic_type, data->pattern); /* Set up input device properties based on queried parameters. */ error = elan_setup_input_device(data); diff --git a/drivers/input/mouse/elan_i2c_i2c.c b/drivers/input/mouse/elan_i2c_i2c.c old mode 100644 new mode 100755 index a679e56..c108589 --- a/drivers/input/mouse/elan_i2c_i2c.c +++ b/drivers/input/mouse/elan_i2c_i2c.c @@ -34,9 +34,12 @@ #define ETP_I2C_DESC_CMD 0x0001 #define ETP_I2C_REPORT_DESC_CMD 0x0002 #define ETP_I2C_STAND_CMD 0x0005 +#define ETP_I2C_PATTERN_CMD 0x0100 #define ETP_I2C_UNIQUEID_CMD 0x0101 #define ETP_I2C_FW_VERSION_CMD 0x0102 -#define ETP_I2C_SM_VERSION_CMD 0x0103 +#define ETP_I2C_IC_TYPE_CMD 0x0103 +#define ETP_I2C_OSM_VERSION_CMD 0x0103 +#define ETP_I2C_NSM_VERSION_CMD 0x0104 #define ETP_I2C_XY_TRACENUM_CMD 0x0105 #define ETP_I2C_MAX_X_AXIS_CMD 0x0106 #define ETP_I2C_MAX_Y_AXIS_CMD 0x0107 @@ -240,7 +243,7 @@ static int elan_i2c_get_baseline_data(struct i2c_client *client, } static int elan_i2c_get_version(struct i2c_client *client, - bool iap, u8 *version) + bool iap, u8 *version, u8 pattern) { int error; u8 val[3]; @@ -255,24 +258,47 @@ static int elan_i2c_get_version(struct i2c_client *client, return error; } - *version = val[0]; + if (pattern == 0x01) + *version = iap ? val[1] : val[0]; + else + *version = val[0]; return 0; } static int elan_i2c_get_sm_version(struct i2c_client *client, - u8 *ic_type, u8 *version) + u16 *ic_type, u8 *version, u8 pattern) { int error; u8 val[3]; - error = elan_i2c_read_cmd(client, ETP_I2C_SM_VERSION_CMD, val); - if (error) { - dev_err(&client->dev, "failed to get SM version: %d\n", error); - return error; + if (pattern == 0x01) { + error = elan_i2c_read_cmd(client, ETP_I2C_IC_TYPE_CMD, val); + if (error) { + dev_err(&client->dev, "failed to get ic type: %d\n", + error); + return error; + } + *ic_type = be16_to_cpup((__be16 *)val); + + error = elan_i2c_read_cmd(client, ETP_I2C_NSM_VERSION_CMD, + val); + if (error) { + dev_err(&client->dev, "failed to get SM version: %d\n", + error); + return error; + } + *version = val[1]; + } else { + error = elan_i2c_read_cmd(client, ETP_I2C_OSM_VERSION_CMD, val); + if (error) { + dev_err(&client->dev, "failed to get SM version: %d\n", + error); + return error; + } + *version = val[0]; + *ic_type = val[1]; } - *version = val[0]; - *ic_type = val[1]; return 0; } @@ -611,6 +637,21 @@ static int elan_i2c_get_report(struct i2c_client *client, u8 *report) return 0; } +static int elan_i2c_get_pattern(struct i2c_client *client, u8 *pattern) +{ + int error; + u8 val[3]; + + error = elan_i2c_read_cmd(client, ETP_I2C_PATTERN_CMD, val); + if (error) { + dev_err(&client->dev, "failed to get pattern: %d\n", error); + return error; + } + *pattern = val[1]; + + return 0; +} + const struct elan_transport_ops elan_i2c_ops = { .initialize = elan_i2c_initialize, .sleep_control = elan_i2c_sleep_control, @@ -639,5 +680,7 @@ const struct elan_transport_ops elan_i2c_ops = { .write_fw_block = elan_i2c_write_fw_block, .finish_fw_update = elan_i2c_finish_fw_update, + .get_pattern = elan_i2c_get_pattern, + .get_report = elan_i2c_get_report, }; diff --git a/drivers/input/mouse/elan_i2c_smbus.c b/drivers/input/mouse/elan_i2c_smbus.c old mode 100644 new mode 100755 index e23b249..912b264 --- a/drivers/input/mouse/elan_i2c_smbus.c +++ b/drivers/input/mouse/elan_i2c_smbus.c @@ -146,7 +146,7 @@ static int elan_smbus_get_baseline_data(struct i2c_client *client, } static int elan_smbus_get_version(struct i2c_client *client, - bool iap, u8 *version) + bool iap, u8 *version, u8 pattern) { int error; u8 val[3]; @@ -166,7 +166,7 @@ static int elan_smbus_get_version(struct i2c_client *client, } static int elan_smbus_get_sm_version(struct i2c_client *client, - u8 *ic_type, u8 *version) + u16 *ic_type, u8 *version, u8 pattern) { int error; u8 val[3]; @@ -495,6 +495,12 @@ static int elan_smbus_finish_fw_update(struct i2c_client *client, return 0; } +static int elan_smbus_get_pattern(struct i2c_client *client, u8 *pattern) +{ + *pattern = 0; + return 0; +} + const struct elan_transport_ops elan_smbus_ops = { .initialize = elan_smbus_initialize, .sleep_control = elan_smbus_sleep_control, @@ -524,4 +530,5 @@ const struct elan_transport_ops elan_smbus_ops = { .finish_fw_update = elan_smbus_finish_fw_update, .get_report = elan_smbus_get_report, + .get_pattern = elan_smbus_get_pattern, };