diff mbox series

[4.19,43/49] Input: trackpoint - add new trackpoint variant IDs

Message ID 20200921162036.567357303@linuxfoundation.org
State Superseded
Headers show
Series None | expand

Commit Message

gregkh@linuxfoundation.org Sept. 21, 2020, 4:28 p.m. UTC
From: Vincent Huang <vincent.huang@tw.synaptics.com>

commit 6c77545af100a72bf5e28142b510ba042a17648d upstream.

Add trackpoint variant IDs to allow supported control on Synaptics
trackpoints.

Signed-off-by: Vincent Huang <vincent.huang@tw.synaptics.com>
Link: https://lore.kernel.org/r/20200914120327.2592-1-vincent.huang@tw.synaptics.com
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/input/mouse/trackpoint.c |   10 ++++++----
 drivers/input/mouse/trackpoint.h |   10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

Comments

Pavel Machek Sept. 22, 2020, 3:39 p.m. UTC | #1
Hi!

> From: Vincent Huang <vincent.huang@tw.synaptics.com>

> 

> commit 6c77545af100a72bf5e28142b510ba042a17648d upstream.

> 

> Add trackpoint variant IDs to allow supported control on Synaptics

> trackpoints.


This just adds unused definitions. I don't think it is needed in
stable.

Best regards,
								Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
gregkh@linuxfoundation.org Sept. 22, 2020, 4:16 p.m. UTC | #2
On Tue, Sep 22, 2020 at 05:39:57PM +0200, Pavel Machek wrote:
> Hi!

> 

> > From: Vincent Huang <vincent.huang@tw.synaptics.com>

> > 

> > commit 6c77545af100a72bf5e28142b510ba042a17648d upstream.

> > 

> > Add trackpoint variant IDs to allow supported control on Synaptics

> > trackpoints.

> 

> This just adds unused definitions. I don't think it is needed in

> stable.


It add support for a new device.
Pavel Machek Sept. 22, 2020, 8:24 p.m. UTC | #3
On Tue 2020-09-22 18:16:42, Greg Kroah-Hartman wrote:
> On Tue, Sep 22, 2020 at 05:39:57PM +0200, Pavel Machek wrote:

> > Hi!

> > 

> > > From: Vincent Huang <vincent.huang@tw.synaptics.com>

> > > 

> > > commit 6c77545af100a72bf5e28142b510ba042a17648d upstream.

> > > 

> > > Add trackpoint variant IDs to allow supported control on Synaptics

> > > trackpoints.

> > 

> > This just adds unused definitions. I don't think it is needed in

> > stable.

> 

> It add support for a new device.


No, it does not. Maybe in mainline there's followup patch that adds
such support, but that's not in 4.19.

Best regards,
								Pavel
-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Dmitry Torokhov Sept. 23, 2020, 8:42 p.m. UTC | #4
On Tue, Sep 22, 2020 at 10:24:03PM +0200, Pavel Machek wrote:
> On Tue 2020-09-22 18:16:42, Greg Kroah-Hartman wrote:
> > On Tue, Sep 22, 2020 at 05:39:57PM +0200, Pavel Machek wrote:
> > > Hi!
> > > 
> > > > From: Vincent Huang <vincent.huang@tw.synaptics.com>
> > > > 
> > > > commit 6c77545af100a72bf5e28142b510ba042a17648d upstream.
> > > > 
> > > > Add trackpoint variant IDs to allow supported control on Synaptics
> > > > trackpoints.
> > > 
> > > This just adds unused definitions. I don't think it is needed in
> > > stable.
> > 
> > It add support for a new device.
> 
> No, it does not. Maybe in mainline there's followup patch that adds
> such support, but that's not in 4.19.

es, indeed, there is a chunk missing, so this patch is incomplete. It
will not cause any issues if applied, so I'll leave it to Greg to decide
what to do with this.

Vincent, there needs to be a change in trackpoint_start_protocol() to
mark these new IDs as valid. Was it s3ent in a separate patch and I
missed it?

Thanks.
Vincent Huang Sept. 24, 2020, 2:16 a.m. UTC | #5
On 9/24/20 4:42 AM, Dmitry Torokhov wrote:
> CAUTION: Email originated externally, do not click links or open attachments unless you recognize the sender and know the content is safe.

>

>

> On Tue, Sep 22, 2020 at 10:24:03PM +0200, Pavel Machek wrote:

>> On Tue 2020-09-22 18:16:42, Greg Kroah-Hartman wrote:

>>> On Tue, Sep 22, 2020 at 05:39:57PM +0200, Pavel Machek wrote:

>>>> Hi!

>>>>

>>>>> From: Vincent Huang <vincent.huang@tw.synaptics.com>

>>>>>

>>>>> commit 6c77545af100a72bf5e28142b510ba042a17648d upstream.

>>>>>

>>>>> Add trackpoint variant IDs to allow supported control on Synaptics

>>>>> trackpoints.

>>>> This just adds unused definitions. I don't think it is needed in

>>>> stable.

>>> It add support for a new device.

>> No, it does not. Maybe in mainline there's followup patch that adds

>> such support, but that's not in 4.19.

> es, indeed, there is a chunk missing, so this patch is incomplete. It

> will not cause any issues if applied, so I'll leave it to Greg to decide

> what to do with this.

>

> Vincent, there needs to be a change in trackpoint_start_protocol() to

> mark these new IDs as valid. Was it s3ent in a separate patch and I

> missed it?


Hi Dmitry:

You are right, I think the code is missing in start_protocol(), I'll 
send one patch to complete it.


Thanks

Vincent

>

> Thanks.

>

> --

> Dmitry
diff mbox series

Patch

--- a/drivers/input/mouse/trackpoint.c
+++ b/drivers/input/mouse/trackpoint.c
@@ -20,10 +20,12 @@ 
 #include "trackpoint.h"
 
 static const char * const trackpoint_variants[] = {
-	[TP_VARIANT_IBM]	= "IBM",
-	[TP_VARIANT_ALPS]	= "ALPS",
-	[TP_VARIANT_ELAN]	= "Elan",
-	[TP_VARIANT_NXP]	= "NXP",
+	[TP_VARIANT_IBM]		= "IBM",
+	[TP_VARIANT_ALPS]		= "ALPS",
+	[TP_VARIANT_ELAN]		= "Elan",
+	[TP_VARIANT_NXP]		= "NXP",
+	[TP_VARIANT_JYT_SYNAPTICS]	= "JYT_Synaptics",
+	[TP_VARIANT_SYNAPTICS]		= "Synaptics",
 };
 
 /*
--- a/drivers/input/mouse/trackpoint.h
+++ b/drivers/input/mouse/trackpoint.h
@@ -27,10 +27,12 @@ 
  * 0x01 was the original IBM trackpoint, others implement very limited
  * subset of trackpoint features.
  */
-#define TP_VARIANT_IBM		0x01
-#define TP_VARIANT_ALPS		0x02
-#define TP_VARIANT_ELAN		0x03
-#define TP_VARIANT_NXP		0x04
+#define TP_VARIANT_IBM			0x01
+#define TP_VARIANT_ALPS			0x02
+#define TP_VARIANT_ELAN			0x03
+#define TP_VARIANT_NXP			0x04
+#define TP_VARIANT_JYT_SYNAPTICS	0x05
+#define TP_VARIANT_SYNAPTICS		0x06
 
 /*
  * Commands