openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: psmouse - cleanup Focaltech code
  Input: i8042 - add XMG C504 to keyboard reset table
This commit is contained in:
Linus Torvalds 2016-11-05 11:26:11 -07:00
parent 03daa36f08 324ae0958c
commit f29b909db9
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/input/mouse/focaltech.c
View File

@ -43,7 +43,7 @@ int focaltech_detect(struct psmouse *psmouse, bool set_properties)
if (set_properties) { if (set_properties) {
psmouse->vendor = "FocalTech"; psmouse->vendor = "FocalTech";
psmouse->name = "FocalTech Touchpad"; psmouse->name = "Touchpad";
} }
return 0; return 0;
@ -146,8 +146,8 @@ static void focaltech_report_state(struct psmouse *psmouse)
} }
input_mt_report_pointer_emulation(dev, true); input_mt_report_pointer_emulation(dev, true);
input_report_key(psmouse->dev, BTN_LEFT, state->pressed); input_report_key(dev, BTN_LEFT, state->pressed);
input_sync(psmouse->dev); input_sync(dev);
} }
static void focaltech_process_touch_packet(struct psmouse *psmouse, static void focaltech_process_touch_packet(struct psmouse *psmouse,

7
drivers/input/serio/i8042-x86ia64io.h
View File

@ -877,6 +877,13 @@ static const struct dmi_system_id __initconst i8042_dmi_kbdreset_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "P34"), DMI_MATCH(DMI_PRODUCT_NAME, "P34"),
}, },
}, },
{
/* Schenker XMG C504 - Elantech touchpad */
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "XMG"),
DMI_MATCH(DMI_PRODUCT_NAME, "C504"),
},
},
{ } { }
}; };