diff mbox

[3/3] hid-multitouch: Add LG Display Multitouch device.

Message ID 1311545261-34067-3-git-send-email-jeffbrown@android.com (mailing list archive)
State New, archived
Delegated to: Jiri Kosina
Headers show

Commit Message

Jeff Brown July 24, 2011, 10:07 p.m. UTC
From: Jeff Brown <jeffbrown@google.com>

Signed-off-by: jeffbrown@android.com
---
 drivers/hid/hid-ids.h        |    3 +++
 drivers/hid/hid-multitouch.c |    5 +++++
 2 files changed, 8 insertions(+), 0 deletions(-)

Comments

Stéphane Chatty July 25, 2011, 9:18 a.m. UTC | #1
Le 25 juil. 2011 à 00:07, jeffbrown@android.com a écrit :

> From: Jeff Brown <jeffbrown@google.com>
> 
> Signed-off-by: jeffbrown@android.com
> ---
> drivers/hid/hid-ids.h        |    3 +++
> drivers/hid/hid-multitouch.c |    5 +++++
> 2 files changed, 8 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index db63ccf..637e6e9 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -419,6 +419,9 @@
> #define USB_DEVICE_ID_LD_HYBRID		0x2090
> #define USB_DEVICE_ID_LD_HEATCONTROL	0x20A0
> 
> +#define USB_VENDOR_ID_LG		0x1fd2
> +#define USB_DEVICE_ID_LG_MULTITOUCH	0x0064
> +
> #define USB_VENDOR_ID_LOGITECH		0x046d
> #define USB_DEVICE_ID_LOGITECH_RECEIVER	0xc101
> #define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST  0xc110
> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
> index 4ee21ac..b03a0b0 100644
> --- a/drivers/hid/hid-multitouch.c
> +++ b/drivers/hid/hid-multitouch.c
> @@ -682,6 +682,11 @@ static const struct hid_device_id mt_devices[] = {
> 		HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS,
> 			USB_DEVICE_ID_IRTOUCH_INFRARED_USB) },
> 
> +	/* LG Display panels */
> +	{ .driver_data = MT_CLS_DEFAULT,
> +		HID_USB_DEVICE(USB_VENDOR_ID_LG,
> +			USB_DEVICE_ID_LG_MULTITOUCH) },
> +
> 	/* Lumio panels */
> 	{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
> 		HID_USB_DEVICE(USB_VENDOR_ID_LUMIO,
> -- 
> 1.7.0.4
> 

I don't have access to the panel for testing, but I trust that Jeff has tested it :-)

Acked-by: Stéphane Chatty <chatty@enac.fr>


--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Benjamin Tissoires July 25, 2011, 9:32 a.m. UTC | #2
On Mon, Jul 25, 2011 at 11:18, Stéphane Chatty <chatty@enac.fr> wrote:
>
> Le 25 juil. 2011 à 00:07, jeffbrown@android.com a écrit :
>
>> From: Jeff Brown <jeffbrown@google.com>
>>
>> Signed-off-by: jeffbrown@android.com
>> ---
>> drivers/hid/hid-ids.h        |    3 +++
>> drivers/hid/hid-multitouch.c |    5 +++++
>> 2 files changed, 8 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
>> index db63ccf..637e6e9 100644
>> --- a/drivers/hid/hid-ids.h
>> +++ b/drivers/hid/hid-ids.h
>> @@ -419,6 +419,9 @@
>> #define USB_DEVICE_ID_LD_HYBRID               0x2090
>> #define USB_DEVICE_ID_LD_HEATCONTROL  0x20A0
>>
>> +#define USB_VENDOR_ID_LG             0x1fd2
>> +#define USB_DEVICE_ID_LG_MULTITOUCH  0x0064
>> +
>> #define USB_VENDOR_ID_LOGITECH                0x046d
>> #define USB_DEVICE_ID_LOGITECH_RECEIVER       0xc101
>> #define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST  0xc110
>> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
>> index 4ee21ac..b03a0b0 100644
>> --- a/drivers/hid/hid-multitouch.c
>> +++ b/drivers/hid/hid-multitouch.c
>> @@ -682,6 +682,11 @@ static const struct hid_device_id mt_devices[] = {
>>               HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS,
>>                       USB_DEVICE_ID_IRTOUCH_INFRARED_USB) },
>>
>> +     /* LG Display panels */
>> +     { .driver_data = MT_CLS_DEFAULT,
>> +             HID_USB_DEVICE(USB_VENDOR_ID_LG,
>> +                     USB_DEVICE_ID_LG_MULTITOUCH) },
>> +
>>       /* Lumio panels */
>>       { .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
>>               HID_USB_DEVICE(USB_VENDOR_ID_LUMIO,
>> --
>> 1.7.0.4
>>
>
> I don't have access to the panel for testing, but I trust that Jeff has tested it :-)
>
> Acked-by: Stéphane Chatty <chatty@enac.fr>

Sorry, but there are some pieces missing.
Please also add the device to the hid_have_special_driver list in
hid-core.c, and add it to the list in Kconfig as well.

Cheers,
Benjamin


>
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index db63ccf..637e6e9 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -419,6 +419,9 @@ 
 #define USB_DEVICE_ID_LD_HYBRID		0x2090
 #define USB_DEVICE_ID_LD_HEATCONTROL	0x20A0
 
+#define USB_VENDOR_ID_LG		0x1fd2
+#define USB_DEVICE_ID_LG_MULTITOUCH	0x0064
+
 #define USB_VENDOR_ID_LOGITECH		0x046d
 #define USB_DEVICE_ID_LOGITECH_RECEIVER	0xc101
 #define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST  0xc110
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 4ee21ac..b03a0b0 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -682,6 +682,11 @@  static const struct hid_device_id mt_devices[] = {
 		HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS,
 			USB_DEVICE_ID_IRTOUCH_INFRARED_USB) },
 
+	/* LG Display panels */
+	{ .driver_data = MT_CLS_DEFAULT,
+		HID_USB_DEVICE(USB_VENDOR_ID_LG,
+			USB_DEVICE_ID_LG_MULTITOUCH) },
+
 	/* Lumio panels */
 	{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
 		HID_USB_DEVICE(USB_VENDOR_ID_LUMIO,