From patchwork Sat Mar 2 01:20:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benson Leung X-Patchwork-Id: 2205391 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 6FC25DF24C for ; Sat, 2 Mar 2013 01:21:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752610Ab3CBBVf (ORCPT ); Fri, 1 Mar 2013 20:21:35 -0500 Received: from mail-pa0-f44.google.com ([209.85.220.44]:52893 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752384Ab3CBBVP (ORCPT ); Fri, 1 Mar 2013 20:21:15 -0500 Received: by mail-pa0-f44.google.com with SMTP id kp1so2134043pab.31 for ; Fri, 01 Mar 2013 17:21:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=W1nrMm53szq1hMM2CAFeDxgGhrlE6J+hLtFLLENquGQ=; b=AVi23DPSibXSHBPMfmFJ2FhIICym5VGvTzsMXnyeB4bxp3a/052uTm/aN2ng7C0zLB /aZyEP+F4fcRqXl4NhXk9VnxE/rG9L3LixngB4HUhGxjG8d7x/QPwyVfdC3igPfcGfQR /xVJDINKK5PqEXRh0HHcQxXZwhAN+zF4h6W2M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=W1nrMm53szq1hMM2CAFeDxgGhrlE6J+hLtFLLENquGQ=; b=XmoMpL282uY2dlBco0awI1+J3y0E+b8bT0s3mZQoKebs3ZKmVypxjDgmhVWpVyuTTz 5ixmee9fJIlDrH7d/+AWIabQUEbGWa5aYBwJes3/yjR+5YiCuAFYldmzPEQjAjU3Jchr eMRVTo12BWG3tKXBXv88WD0+18zTtxjL5VwW/iLHrBuOFSNwHEnHiG2z+QxHl0aV7gg4 ARo+3gXL7VkyYE1rue0WKGlsSAmcojulc8QRxz8lLDmQdTPr5wWLrSaU4JjPUXRYqiYm FXTAUETiEOU6ff0HZxUifHBNBtNI/tt65+p9iJtYYfjx8e/ta+0aMpqgtRpdzvN+Qjih zuqA== X-Received: by 10.68.194.2 with SMTP id hs2mr17032785pbc.192.1362187274357; Fri, 01 Mar 2013 17:21:14 -0800 (PST) Received: from laughingman.mtv.corp.google.com (laughingman.mtv.corp.google.com [172.22.73.99]) by mx.google.com with ESMTPS id kt5sm13716751pbc.30.2013.03.01.17.21.12 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 01 Mar 2013 17:21:13 -0800 (PST) From: Benson Leung To: olofj@chromium.org, miletus@chromium.org, dmitry.torokhov@gmail.com, matthew.garrett@nebula.com, rydberg@euromail.se, djkurtz@chromium.org, jy0922.shim@samsung.com, wfp5p@virginia.edu, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org Cc: bleung@chromium.org Subject: [PATCH 1/2] Input: atmel_mxt_ts - add device id for touchpad variant Date: Fri, 1 Mar 2013 17:20:53 -0800 Message-Id: <1362187254-9227-2-git-send-email-bleung@chromium.org> X-Mailer: git-send-email 1.8.1.3 In-Reply-To: <1362187254-9227-1-git-send-email-bleung@chromium.org> References: <1362187254-9227-1-git-send-email-bleung@chromium.org> X-Gm-Message-State: ALoCoQloht9CNGjS5/cM5ZA4f8Kiawn9yVyCzcyKPu+BnxB8GiNn4deKWykuGSqZhLFxlgGoh54m Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Daniel Kurtz This same driver can be used by atmel based touchscreens and touchpads (buttonpads) by instantiating the i2c device as a "atmel_mxt_tp". This will cause the driver to perform some touchpad specific initializations, such as: * register input device name "Atmel maXTouch Touchpad" instead of Touchscreen. * register BTN_LEFT & BTN_TOOL_* event types. * register axis resolution (as a fixed constant, for now) * register BUTTONPAD property * process GPIO buttons using reportid T19 For now, the left mouse button is mapped to GPIO3. Going forward, platform data should specify the configuration of the buttons. They can be configured via a future platform data change to specify optional middle and right buttons, as well as other possible uses for the GPIO object T19. Signed-off-by: Daniel Kurtz Signed-off-by: Benson Leung Change-Id: Ia82e75d85111c94f6c3fb423181df0fa4b964fc4 Tested-by: Olof Johansson --- drivers/input/touchscreen/atmel_mxt_ts.c | 55 +++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index d04f810..66745b9 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -181,6 +181,12 @@ #define MXT_FWRESET_TIME 175 /* msec */ +/* MXT_SPT_GPIOPWM_T19 field */ +#define MXT_GPIO0_MASK 0x04 +#define MXT_GPIO1_MASK 0x08 +#define MXT_GPIO2_MASK 0x10 +#define MXT_GPIO3_MASK 0x20 + /* Command to unlock bootloader */ #define MXT_UNLOCK_CMD_MSB 0xaa #define MXT_UNLOCK_CMD_LSB 0xdc @@ -212,6 +218,8 @@ /* Touchscreen absolute values */ #define MXT_MAX_AREA 0xff +#define MXT_PIXELS_PER_MM 20 + struct mxt_info { u8 family_id; u8 variant_id; @@ -243,6 +251,8 @@ struct mxt_data { const struct mxt_platform_data *pdata; struct mxt_object *object_table; struct mxt_info info; + bool is_tp; + unsigned int irq; unsigned int max_x; unsigned int max_y; @@ -251,6 +261,7 @@ struct mxt_data { u8 T6_reportid; u8 T9_reportid_min; u8 T9_reportid_max; + u8 T19_reportid; }; static bool mxt_object_readable(unsigned int type) @@ -502,6 +513,18 @@ static int mxt_write_object(struct mxt_data *data, return mxt_write_reg(data->client, reg + offset, val); } +static void mxt_input_button(struct mxt_data *data, struct mxt_message *message) +{ + struct device *dev = &data->client->dev; + struct input_dev *input = data->input_dev; + bool button; + + /* Active-low switch */ + button = !(message->message[0] & MXT_GPIO3_MASK); + input_report_key(input, BTN_LEFT, button); + dev_dbg(dev, "Button state: %d\n", button); +} + static void mxt_input_touchevent(struct mxt_data *data, struct mxt_message *message, int id) { @@ -585,6 +608,9 @@ static irqreturn_t mxt_interrupt(int irq, void *dev_id) int id = reportid - data->T9_reportid_min; mxt_input_touchevent(data, &message, id); update_input = true; + } else if (message.reportid == data->T19_reportid) { + mxt_input_button(data, &message); + update_input = true; } else { mxt_dump_message(dev, &message); } @@ -764,6 +790,9 @@ static int mxt_get_object_table(struct mxt_data *data) data->T9_reportid_min = min_id; data->T9_reportid_max = max_id; break; + case MXT_SPT_GPIOPWM_T19: + data->T19_reportid = min_id; + break; } } @@ -1115,9 +1144,13 @@ static int mxt_probe(struct i2c_client *client, goto err_free_mem; } - input_dev->name = "Atmel maXTouch Touchscreen"; + data->is_tp = !strcmp(id->name, "atmel_mxt_tp"); + + input_dev->name = (data->is_tp) ? "Atmel maXTouch Touchpad" : + "Atmel maXTouch Touchscreen"; snprintf(data->phys, sizeof(data->phys), "i2c-%u-%04x/input0", client->adapter->nr, client->addr); + input_dev->phys = data->phys; input_dev->id.bustype = BUS_I2C; @@ -1140,6 +1173,25 @@ static int mxt_probe(struct i2c_client *client, __set_bit(EV_KEY, input_dev->evbit); __set_bit(BTN_TOUCH, input_dev->keybit); + if (data->is_tp) { + __set_bit(INPUT_PROP_POINTER, input_dev->propbit); + __set_bit(INPUT_PROP_BUTTONPAD, input_dev->propbit); + + __set_bit(BTN_LEFT, input_dev->keybit); + __set_bit(BTN_TOOL_FINGER, input_dev->keybit); + __set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit); + __set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit); + __set_bit(BTN_TOOL_QUADTAP, input_dev->keybit); + __set_bit(BTN_TOOL_QUINTTAP, input_dev->keybit); + + input_abs_set_res(input_dev, ABS_X, MXT_PIXELS_PER_MM); + input_abs_set_res(input_dev, ABS_Y, MXT_PIXELS_PER_MM); + input_abs_set_res(input_dev, ABS_MT_POSITION_X, + MXT_PIXELS_PER_MM); + input_abs_set_res(input_dev, ABS_MT_POSITION_Y, + MXT_PIXELS_PER_MM); + } + /* For single touch */ input_set_abs_params(input_dev, ABS_X, 0, data->max_x, 0, 0); @@ -1258,6 +1310,7 @@ static SIMPLE_DEV_PM_OPS(mxt_pm_ops, mxt_suspend, mxt_resume); static const struct i2c_device_id mxt_id[] = { { "qt602240_ts", 0 }, { "atmel_mxt_ts", 0 }, + { "atmel_mxt_tp", 0 }, { "mXT224", 0 }, { } };