Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
"Just a couple of driver quirks"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: trackpoint - add new trackpoint variant IDs
Input: i8042 - add Entroware Proteus EL07R4 to nomux and reset lists
+28
-8
+6
-4
drivers/input/mouse/trackpoint.c
+6
-4
drivers/input/mouse/trackpoint.c
···
17
17
#include "trackpoint.h"
18
18
19
19
static const char * const trackpoint_variants[] = {
20
-
[TP_VARIANT_IBM] = "IBM",
21
-
[TP_VARIANT_ALPS] = "ALPS",
22
-
[TP_VARIANT_ELAN] = "Elan",
23
-
[TP_VARIANT_NXP] = "NXP",
20
+
[TP_VARIANT_IBM] = "IBM",
21
+
[TP_VARIANT_ALPS] = "ALPS",
22
+
[TP_VARIANT_ELAN] = "Elan",
23
+
[TP_VARIANT_NXP] = "NXP",
24
+
[TP_VARIANT_JYT_SYNAPTICS] = "JYT_Synaptics",
25
+
[TP_VARIANT_SYNAPTICS] = "Synaptics",
24
26
};
25
27
26
28
/*
+6
-4
drivers/input/mouse/trackpoint.h
+6
-4
drivers/input/mouse/trackpoint.h
···
24
24
* 0x01 was the original IBM trackpoint, others implement very limited
25
25
* subset of trackpoint features.
26
26
*/
27
-
#define TP_VARIANT_IBM 0x01
28
-
#define TP_VARIANT_ALPS 0x02
29
-
#define TP_VARIANT_ELAN 0x03
30
-
#define TP_VARIANT_NXP 0x04
27
+
#define TP_VARIANT_IBM 0x01
28
+
#define TP_VARIANT_ALPS 0x02
29
+
#define TP_VARIANT_ELAN 0x03
30
+
#define TP_VARIANT_NXP 0x04
31
+
#define TP_VARIANT_JYT_SYNAPTICS 0x05
32
+
#define TP_VARIANT_SYNAPTICS 0x06
31
33
32
34
/*
33
35
* Commands
+16
drivers/input/serio/i8042-x86ia64io.h
+16
drivers/input/serio/i8042-x86ia64io.h
···
548
548
DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"),
549
549
},
550
550
},
551
+
{
552
+
/* Entroware Proteus */
553
+
.matches = {
554
+
DMI_MATCH(DMI_SYS_VENDOR, "Entroware"),
555
+
DMI_MATCH(DMI_PRODUCT_NAME, "Proteus"),
556
+
DMI_MATCH(DMI_PRODUCT_VERSION, "EL07R4"),
557
+
},
558
+
},
551
559
{ }
552
560
};
553
561
···
682
674
.matches = {
683
675
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
684
676
DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"),
677
+
},
678
+
},
679
+
{
680
+
/* Entroware Proteus */
681
+
.matches = {
682
+
DMI_MATCH(DMI_SYS_VENDOR, "Entroware"),
683
+
DMI_MATCH(DMI_PRODUCT_NAME, "Proteus"),
684
+
DMI_MATCH(DMI_PRODUCT_VERSION, "EL07R4"),
685
685
},
686
686
},
687
687
{ }