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 layer updates from Dmitry Torokhov:
"Just a few quirks for PS/2 this time"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: elantech - add more Fujtisu notebooks to force crc_enabled
Input: i8042 - add noloop quirk for Medion Akoya E7225 (MD98857)
Input: synaptics - adjust min/max for Lenovo ThinkPad X1 Carbon 2nd
+28
-3
+16
drivers/input/mouse/elantech.c
+16
drivers/input/mouse/elantech.c
···
1097
1097
* Asus UX31 0x361f00 20, 15, 0e clickpad
1098
1098
* Asus UX32VD 0x361f02 00, 15, 0e clickpad
1099
1099
* Avatar AVIU-145A2 0x361f00 ? clickpad
1100
+
* Fujitsu LIFEBOOK E544 0x470f00 d0, 12, 09 2 hw buttons
1101
+
* Fujitsu LIFEBOOK E554 0x570f01 40, 14, 0c 2 hw buttons
1100
1102
* Fujitsu H730 0x570f00 c0, 14, 0c 3 hw buttons (**)
1101
1103
* Gigabyte U2442 0x450f01 58, 17, 0c 2 hw buttons
1102
1104
* Lenovo L430 0x350f02 b9, 15, 0c 2 hw buttons (*)
···
1475
1473
.matches = {
1476
1474
DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
1477
1475
DMI_MATCH(DMI_PRODUCT_NAME, "CELSIUS H730"),
1476
+
},
1477
+
},
1478
+
{
1479
+
/* Fujitsu LIFEBOOK E554 does not work with crc_enabled == 0 */
1480
+
.matches = {
1481
+
DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
1482
+
DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E554"),
1483
+
},
1484
+
},
1485
+
{
1486
+
/* Fujitsu LIFEBOOK E544 does not work with crc_enabled == 0 */
1487
+
.matches = {
1488
+
DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
1489
+
DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E544"),
1478
1490
},
1479
1491
},
1480
1492
#endif
+4
-3
drivers/input/mouse/synaptics.c
+4
-3
drivers/input/mouse/synaptics.c
···
135
135
1232, 5710, 1156, 4696
136
136
},
137
137
{
138
-
(const char * const []){"LEN0034", "LEN0036", "LEN0039",
139
-
"LEN2002", "LEN2004", NULL},
138
+
(const char * const []){"LEN0034", "LEN0036", "LEN0037",
139
+
"LEN0039", "LEN2002", "LEN2004",
140
+
NULL},
140
141
1024, 5112, 2024, 4832
141
142
},
142
143
{
···
166
165
"LEN0034", /* T431s, L440, L540, T540, W540, X1 Carbon 2nd */
167
166
"LEN0035", /* X240 */
168
167
"LEN0036", /* T440 */
169
-
"LEN0037",
168
+
"LEN0037", /* X1 Carbon 2nd */
170
169
"LEN0038",
171
170
"LEN0039", /* T440s */
172
171
"LEN0041",
+8
drivers/input/serio/i8042-x86ia64io.h
+8
drivers/input/serio/i8042-x86ia64io.h
···
152
152
},
153
153
},
154
154
{
155
+
/* Medion Akoya E7225 */
156
+
.matches = {
157
+
DMI_MATCH(DMI_SYS_VENDOR, "Medion"),
158
+
DMI_MATCH(DMI_PRODUCT_NAME, "Akoya E7225"),
159
+
DMI_MATCH(DMI_PRODUCT_VERSION, "1.0"),
160
+
},
161
+
},
162
+
{
155
163
/* Blue FB5601 */
156
164
.matches = {
157
165
DMI_MATCH(DMI_SYS_VENDOR, "blue"),