From: Benson Leung <bleung@chromium.org>
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 [thread overview]
Message-ID: <1362187254-9227-2-git-send-email-bleung@chromium.org> (raw)
In-Reply-To: <1362187254-9227-1-git-send-email-bleung@chromium.org>
From: Daniel Kurtz <djkurtz@chromium.org>
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 <djkurtz@chromium.org>
Signed-off-by: Benson Leung <bleung@chromium.org>
Change-Id: Ia82e75d85111c94f6c3fb423181df0fa4b964fc4
---
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 },
{ }
};
--
1.8.1.3
next prev parent reply other threads:[~2013-03-02 1:21 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-02 1:20 [PATCH 0/2] Add platform data and touchpad functionality for Pixel Benson Leung
2013-03-02 1:20 ` Benson Leung [this message]
2013-03-02 3:57 ` [PATCH 1/2] Input: atmel_mxt_ts - add device id for touchpad variant Olof Johansson
2013-03-02 1:20 ` [PATCH 2/2] Platform: x86: chromeos_laptop : Add basic platform data for atmel devices Benson Leung
2013-03-02 4:00 ` Olof Johansson
2013-03-06 7:41 ` [PATCH v2 0/2] Add platform data and touchpad functionality for Pixel Benson Leung
2013-03-06 7:41 ` [PATCH v2 1/2] Input: atmel_mxt_ts - add device id for touchpad variant Benson Leung
2013-03-06 8:44 ` Joonyoung Shim
2013-03-06 7:41 ` [PATCH v2 2/2] Platform: x86: chromeos_laptop : Add basic platform data for atmel devices Benson Leung
2013-03-08 3:43 ` [PATCH v3 0/2] Add platform data and touchpad functionality for Pixel Benson Leung
2013-03-08 3:43 ` [PATCH v3 1/2] Input: atmel_mxt_ts - Support for touchpad variant Benson Leung
2013-03-08 6:57 ` Benson Leung
2013-03-10 9:13 ` Henrik Rydberg
2013-03-08 3:43 ` [PATCH v3 2/2] Platform: x86: chromeos_laptop : Add basic platform data for atmel devices Benson Leung
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1362187254-9227-2-git-send-email-bleung@chromium.org \
--to=bleung@chromium.org \
--cc=djkurtz@chromium.org \
--cc=dmitry.torokhov@gmail.com \
--cc=jy0922.shim@samsung.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matthew.garrett@nebula.com \
--cc=miletus@chromium.org \
--cc=olofj@chromium.org \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rydberg@euromail.se \
--cc=wfp5p@virginia.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).