aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Curti <michele.curti@gmail.com>2015-08-24 13:49:29 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-08-24 13:55:49 -0400
commit534fcb3bdaab801636d2146079462f7fdf52be0a (patch)
tree28dac2252c8d094d7d1a83fc196605f2bbd36932
parent4ea14a53d8f881034fa9e186653821c4e3d9a8fb (diff)
Input: elan_i2c - enable ELAN0100 acpi panels
Enable ELAN0100 touchpad driver, found on a Asus X205TA laptop, to gai 2,3 fingers tap and 2 fingers scroll. Signed-off-by: Michele Curti <michele.curti@gmail.com> Reviewed-by: Duson Lin <dusonlin@emc.com.tw> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/hid/hid-core.c1
-rw-r--r--drivers/input/mouse/elan_i2c_core.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 279898c0a160..3028c1687a51 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -2268,6 +2268,7 @@ static const struct hid_device_id hid_ignore_list[] = {
2268 { HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, 0x0004) }, 2268 { HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, 0x0004) },
2269 { HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, 0x000a) }, 2269 { HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, 0x000a) },
2270 { HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, 0x0400) }, 2270 { HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, 0x0400) },
2271 { HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, 0x0401) },
2271 { HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) }, 2272 { HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },
2272 { HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC5UH) }, 2273 { HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC5UH) },
2273 { HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC4UM) }, 2274 { HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC4UM) },
diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
index 67388f42ed9a..bbdaedc09261 100644
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -98,6 +98,9 @@ static int elan_get_fwinfo(u8 ic_type, u16 *vaildpage_count,
98 u16 *signature_address) 98 u16 *signature_address)
99{ 99{
100 switch(ic_type) { 100 switch(ic_type) {
101 case 0x08:
102 *vaildpage_count = 512;
103 break;
101 case 0x09: 104 case 0x09:
102 *vaildpage_count = 768; 105 *vaildpage_count = 768;
103 break; 106 break;
@@ -1165,6 +1168,7 @@ MODULE_DEVICE_TABLE(i2c, elan_id);
1165#ifdef CONFIG_ACPI 1168#ifdef CONFIG_ACPI
1166static const struct acpi_device_id elan_acpi_id[] = { 1169static const struct acpi_device_id elan_acpi_id[] = {
1167 { "ELAN0000", 0 }, 1170 { "ELAN0000", 0 },
1171 { "ELAN0100", 0 },
1168 { "ELAN0600", 0 }, 1172 { "ELAN0600", 0 },
1169 { } 1173 { }
1170}; 1174};