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 subsystem updates from Dmitry Torokhov.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: wacom - add support for EMR on Cintiq 24HD touch
Input: i8042 - add Gigabyte T1005 series netbooks to noloop table
Input: imx_keypad - reset the hardware before enabling
Input: edt-ft5x06 - fix build error when compiling wthout CONFIG_DEBUG_FS
+23
-2
+3
drivers/input/keyboard/imx_keypad.c
+3
drivers/input/keyboard/imx_keypad.c
···
358
358
/* Inhibit KDI and KRI interrupts. */
359
359
reg_val = readw(keypad->mmio_base + KPSR);
360
360
reg_val &= ~(KBD_STAT_KRIE | KBD_STAT_KDIE);
361
+
reg_val |= KBD_STAT_KPKR | KBD_STAT_KPKD;
361
362
writew(reg_val, keypad->mmio_base + KPSR);
362
363
363
364
/* Colums as open drain and disable all rows */
···
516
515
input_set_drvdata(input_dev, keypad);
517
516
518
517
/* Ensure that the keypad will stay dormant until opened */
518
+
clk_enable(keypad->clk);
519
519
imx_keypad_inhibit(keypad);
520
+
clk_disable(keypad->clk);
520
521
521
522
error = request_irq(irq, imx_keypad_irq_handler, 0,
522
523
pdev->name, keypad);
+14
drivers/input/serio/i8042-x86ia64io.h
+14
drivers/input/serio/i8042-x86ia64io.h
···
177
177
},
178
178
},
179
179
{
180
+
/* Gigabyte T1005 - defines wrong chassis type ("Other") */
181
+
.matches = {
182
+
DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"),
183
+
DMI_MATCH(DMI_PRODUCT_NAME, "T1005"),
184
+
},
185
+
},
186
+
{
187
+
/* Gigabyte T1005M/P - defines wrong chassis type ("Other") */
188
+
.matches = {
189
+
DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"),
190
+
DMI_MATCH(DMI_PRODUCT_NAME, "T1005M/P"),
191
+
},
192
+
},
193
+
{
180
194
.matches = {
181
195
DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
182
196
DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv9700"),
+5
-1
drivers/input/tablet/wacom_wac.c
+5
-1
drivers/input/tablet/wacom_wac.c
···
1848
1848
{ "Wacom Intuos5 M", WACOM_PKGLEN_INTUOS, 44704, 27940, 2047,
1849
1849
63, INTUOS5, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
1850
1850
static const struct wacom_features wacom_features_0xF4 =
1851
-
{ "Wacom Cintiq 24HD", WACOM_PKGLEN_INTUOS, 104480, 65600, 2047,
1851
+
{ "Wacom Cintiq 24HD", WACOM_PKGLEN_INTUOS, 104480, 65600, 2047,
1852
+
63, WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
1853
+
static const struct wacom_features wacom_features_0xF8 =
1854
+
{ "Wacom Cintiq 24HD touch", WACOM_PKGLEN_INTUOS, 104480, 65600, 2047,
1852
1855
63, WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
1853
1856
static const struct wacom_features wacom_features_0x3F =
1854
1857
{ "Wacom Cintiq 21UX", WACOM_PKGLEN_INTUOS, 87200, 65600, 1023,
···
2094
2091
{ USB_DEVICE_WACOM(0xEF) },
2095
2092
{ USB_DEVICE_WACOM(0x47) },
2096
2093
{ USB_DEVICE_WACOM(0xF4) },
2094
+
{ USB_DEVICE_WACOM(0xF8) },
2097
2095
{ USB_DEVICE_WACOM(0xFA) },
2098
2096
{ USB_DEVICE_LENOVO(0x6004) },
2099
2097
{ }
+1
-1
drivers/input/touchscreen/edt-ft5x06.c
+1
-1
drivers/input/touchscreen/edt-ft5x06.c
···
602
602
{
603
603
if (tsdata->debug_dir)
604
604
debugfs_remove_recursive(tsdata->debug_dir);
605
+
kfree(tsdata->raw_buffer);
605
606
}
606
607
607
608
#else
···
844
843
if (gpio_is_valid(pdata->reset_pin))
845
844
gpio_free(pdata->reset_pin);
846
845
847
-
kfree(tsdata->raw_buffer);
848
846
kfree(tsdata);
849
847
850
848
return 0;