diff mbox series

[1/1] UBUNTU: SAUCE: HID: multitouch: Add LG MELF0410 I2C touchscreen support

Message ID 20191225124608.5147-2-aaron.ma@canonical.com
State New
Headers show
Series UBUNTU: SAUCE: Add LG I2C touchscreen multitouch support | expand

Commit Message

Aaron Ma Dec. 25, 2019, 12:46 p.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1857541

Add multitouch support for LG MELF I2C touchscreen.
Apply the same workaround as LG USB touchscreen.

Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
(cherry picked from commit 348b80b273fbf4ce2a307f9e38eadecf37828cad
https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git)
Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
---
 drivers/hid/hid-ids.h        | 1 +
 drivers/hid/hid-multitouch.c | 3 +++
 2 files changed, 4 insertions(+)

Comments

Kleber Souza Jan. 7, 2020, 12:38 p.m. UTC | #1
On 2019-12-25 13:46, Aaron Ma wrote:
> BugLink: https://bugs.launchpad.net/bugs/1857541
> 
> Add multitouch support for LG MELF I2C touchscreen.
> Apply the same workaround as LG USB touchscreen.
> 
> Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
> (cherry picked from commit 348b80b273fbf4ce2a307f9e38eadecf37828cad
> https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git)
> Signed-off-by: Aaron Ma <aaron.ma@canonical.com>

Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

> ---
>  drivers/hid/hid-ids.h        | 1 +
>  drivers/hid/hid-multitouch.c | 3 +++
>  2 files changed, 4 insertions(+)
> 
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index b349e6846201..28696fbda11e 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -702,6 +702,7 @@
>  #define USB_DEVICE_ID_LG_MULTITOUCH	0x0064
>  #define USB_DEVICE_ID_LG_MELFAS_MT	0x6007
>  #define I2C_DEVICE_ID_LG_8001		0x8001
> +#define I2C_DEVICE_ID_LG_7010		0x7010
>  
>  #define USB_VENDOR_ID_LOGITECH		0x046d
>  #define USB_DEVICE_ID_LOGITECH_AUDIOHUB 0x0a0e
> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
> index 15687b45b33c..23948103b453 100644
> --- a/drivers/hid/hid-multitouch.c
> +++ b/drivers/hid/hid-multitouch.c
> @@ -1661,6 +1661,9 @@ static const struct hid_device_id mt_devices[] = {
>  	{ .driver_data = MT_CLS_LG,
>  		HID_USB_DEVICE(USB_VENDOR_ID_LG,
>  			USB_DEVICE_ID_LG_MELFAS_MT) },
> +	{ .driver_data = MT_CLS_LG,
> +		HID_DEVICE(BUS_I2C, HID_GROUP_GENERIC,
> +			USB_VENDOR_ID_LG, I2C_DEVICE_ID_LG_7010) },
>  
>  	/* MosArt panels */
>  	{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
>
Marcelo Henrique Cerri Jan. 7, 2020, 1:49 p.m. UTC | #2
Acked-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
diff mbox series

Patch

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index b349e6846201..28696fbda11e 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -702,6 +702,7 @@ 
 #define USB_DEVICE_ID_LG_MULTITOUCH	0x0064
 #define USB_DEVICE_ID_LG_MELFAS_MT	0x6007
 #define I2C_DEVICE_ID_LG_8001		0x8001
+#define I2C_DEVICE_ID_LG_7010		0x7010
 
 #define USB_VENDOR_ID_LOGITECH		0x046d
 #define USB_DEVICE_ID_LOGITECH_AUDIOHUB 0x0a0e
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 15687b45b33c..23948103b453 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1661,6 +1661,9 @@  static const struct hid_device_id mt_devices[] = {
 	{ .driver_data = MT_CLS_LG,
 		HID_USB_DEVICE(USB_VENDOR_ID_LG,
 			USB_DEVICE_ID_LG_MELFAS_MT) },
+	{ .driver_data = MT_CLS_LG,
+		HID_DEVICE(BUS_I2C, HID_GROUP_GENERIC,
+			USB_VENDOR_ID_LG, I2C_DEVICE_ID_LG_7010) },
 
 	/* MosArt panels */
 	{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,