| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-id: <51370206.7000608@samsung.com>
Date: Wed, 06 Mar 2013 17:44:54 +0900
From: Joonyoung Shim <jy0922.shim@...sung.com>
To: Benson Leung <bleung@...omium.org>
Cc: olofj@...omium.org, miletus@...omium.org,
dmitry.torokhov@...il.com, matthew.garrett@...ula.com,
rydberg@...omail.se, djkurtz@...omium.org, wfp5p@...ginia.edu,
linux-input@...r.kernel.org, linux-kernel@...r.kernel.org,
platform-driver-x86@...r.kernel.org,
Nick Dyer <nick.dyer@...ev.co.uk>
Subject: Re: [PATCH v2 1/2] Input: atmel_mxt_ts - add device id for touchpad
variant
Hi Benson,
On 03/06/2013 04:41 PM, Benson Leung wrote:
> From: Daniel Kurtz <djkurtz@...omium.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.
It's better to implement this now.
> Signed-off-by: Daniel Kurtz <djkurtz@...omium.org>
> Signed-off-by: Benson Leung <bleung@...omium.org>
> Signed-off-by: Nick Dyer <nick.dyer@...ev.co.uk>
> Tested-by: Olof Johansson <olof@...om.net>
> ---
> v2: zero reportid in mxt_object_table_free(), Thanks nick.dyer@...ev.co.uk
> v1: Initial
> ---
> drivers/input/touchscreen/atmel_mxt_ts.c | 57 ++++++++++++++++++++++++++++++--
> 1 file changed, 55 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
> index d04f810..3611a26 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;
> }
> }
>
> @@ -777,7 +806,7 @@ static void mxt_free_object_table(struct mxt_data *data)
> data->T6_reportid = 0;
> data->T9_reportid_min = 0;
> data->T9_reportid_max = 0;
> -
> + data->T19_reportid = 0;
> }
>
> static int mxt_initialize(struct mxt_data *data)
> @@ -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 },
How about driver_data to distinguish touchscreen and touchpad?
> { "mXT224", 0 },
> { }
> };
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists