Re: [PATCH v2] Input: elan_i2c - enable ELAN0100 acpi panels

[Dmitry Torokhov]

On Sat, Aug 22, 2015 at 09:37:52AM +0200, Michele Curti wrote:
> 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@xxxxxxxxx>

Applied, thank you (Duson, I put you as 'reviewed-by').

> ---
>  drivers/hid/hid-core.c              | 1 +
>  drivers/input/mouse/elan_i2c_core.c | 4 ++++
>  2 files changed, 5 insertions(+)
> 
> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
> index 22afab9..70a11ac 100644
> --- a/drivers/hid/hid-core.c
> +++ b/drivers/hid/hid-core.c
> @@ -2294,6 +2294,7 @@ static const struct hid_device_id hid_ignore_list[] = {
>  	{ HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, 0x0004) },
>  	{ HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, 0x000a) },
>  	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, 0x0400) },
> +	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, 0x0401) },
>  	{ HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },
>  	{ HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC5UH) },
>  	{ 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 67388f4..bbdaedc 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,
>  			   u16 *signature_address)
>  {
>  	switch(ic_type) {
> +	case 0x08:
> +		*vaildpage_count = 512;
> +		break;
>  	case 0x09:
>  		*vaildpage_count = 768;
>  		break;
> @@ -1165,6 +1168,7 @@ MODULE_DEVICE_TABLE(i2c, elan_id);
>  #ifdef CONFIG_ACPI
>  static const struct acpi_device_id elan_acpi_id[] = {
>  	{ "ELAN0000", 0 },
> +	{ "ELAN0100", 0 },
>  	{ "ELAN0600", 0 },
>  	{ }
>  };
> -- 
> 2.5.0
> 

-- 
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/