From: Andrew Duggan <aduggan@synaptics.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Aaron Ma <aaron.ma@canonical.com>
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
Benjamin Tissoires <benjamin.tissoires@redhat.com>
Subject: Re: [PATCH] Input: trackpoint: add new trackpoint firmware ID
Date: Mon, 13 Feb 2017 16:30:02 -0800 [thread overview]
Message-ID: <ade83a37-f7d2-eaf0-d40b-c49511049dd1@synaptics.com> (raw)
In-Reply-To: <20170212223859.GA15928@dtor-ws>
On 02/12/2017 02:38 PM, Dmitry Torokhov wrote:
> On Fri, Feb 10, 2017 at 11:02:21AM +0800, Aaron Ma wrote:
>> Synaptics add new TP firmware ID: 0x2 and 0x3, for now both lower 2 bits
>> are indicated as TP. Change the constant to bitwise values.
> Hmm, I thought IBM/Lenovo owned trackpoint support... Andrew, is it
> yours now?
No, it should still be Lenovo's trackpoint.
Andrew
> Aaron, what devices have these new trackpoints>?
>
> Thanks.
>
>> Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
>> Cc: stable@vger.kernel.org
>> ---
>> drivers/input/mouse/trackpoint.c | 3 ++-
>> drivers/input/mouse/trackpoint.h | 3 ++-
>> 2 files changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c
>> index 7331084..9ff0f38 100644
>> --- a/drivers/input/mouse/trackpoint.c
>> +++ b/drivers/input/mouse/trackpoint.c
>> @@ -265,7 +265,8 @@ static int trackpoint_start_protocol(struct psmouse *psmouse, unsigned char *fir
>> if (ps2_command(&psmouse->ps2dev, param, MAKE_PS2_CMD(0, 2, TP_READ_ID)))
>> return -1;
>>
>> - if (param[0] != TP_MAGIC_IDENT)
>> + /* add new TP ID. */
>> + if (!(param[0] & TP_MAGIC_IDENT))
>> return -1;
>>
>> if (firmware_id)
>> diff --git a/drivers/input/mouse/trackpoint.h b/drivers/input/mouse/trackpoint.h
>> index 5617ed3..8805575 100644
>> --- a/drivers/input/mouse/trackpoint.h
>> +++ b/drivers/input/mouse/trackpoint.h
>> @@ -21,8 +21,9 @@
>> #define TP_COMMAND 0xE2 /* Commands start with this */
>>
>> #define TP_READ_ID 0xE1 /* Sent for device identification */
>> -#define TP_MAGIC_IDENT 0x01 /* Sent after a TP_READ_ID followed */
>> +#define TP_MAGIC_IDENT 0x03 /* Sent after a TP_READ_ID followed */
>> /* by the firmware ID */
>> + /* Firmware ID includes 0x1, 0x2, 0x3 */
>>
>>
>> /*
>> --
>> 2.9.3
>>
next prev parent reply other threads:[~2017-02-14 0:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-10 3:02 [PATCH] Input: trackpoint: add new trackpoint firmware ID Aaron Ma
2017-02-12 22:38 ` Dmitry Torokhov
2017-02-13 0:21 ` Aaron Ma
2017-02-14 0:30 ` Andrew Duggan [this message]
2017-02-14 4:24 ` Dmitry Torokhov
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=ade83a37-f7d2-eaf0-d40b-c49511049dd1@synaptics.com \
--to=aduggan@synaptics.com \
--cc=aaron.ma@canonical.com \
--cc=benjamin.tissoires@redhat.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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).