* [PATCH] HID:multitouch:add driver for CJTouch MultiTouch
@ 2015-07-05 13:56 linuxsea
2015-07-06 7:55 ` Benjamin Tissoires
0 siblings, 1 reply; 4+ messages in thread
From: linuxsea @ 2015-07-05 13:56 UTC (permalink / raw)
To: jkosina; +Cc: linux-input, linux-kernel, linuxsea
From: Yang Bo <linuxsea@163.com>
Signed-off-by: Yang Bo <linuxsea@163.com>
---
drivers/hid/Kconfig | 1 +
drivers/hid/hid-ids.h | 4 ++++
drivers/hid/hid-multitouch.c | 8 ++++++++
3 files changed, 13 insertions(+)
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index cc4c664..57c94d7 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -480,6 +480,7 @@ config HID_MULTITOUCH
- Atmel panels
- Cando dual touch panels
- Chunghwa panels
+ - CJTouch panels
- CVTouch panels
- Cypress TrueTouch panels
- Elan Microelectronics touch panels
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index b04b082..591b7d0 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -236,6 +236,10 @@
#define USB_VENDOR_ID_CIDC 0x1677
+#define USB_VENDOR_ID_CJTOUCH 0x24b8
+#define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0020 0x0020
+#define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0040 0x0040
+
#define USB_VENDOR_ID_CMEDIA 0x0d8c
#define USB_DEVICE_ID_CM109 0x000e
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 6a9b05b..5055008 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1138,6 +1138,14 @@ static const struct hid_device_id mt_devices[] = {
MT_USB_DEVICE(USB_VENDOR_ID_CHUNGHWAT,
USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH) },
+ /* CJTouch panels */
+ { .driver_data = MT_CLS_DEFAULT,
+ HID_USB_DEVICE(USB_VENDOR_ID_CJTOUCH,
+ USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0020) },
+ { .driver_data = MT_CLS_DEFAULT,
+ HID_USB_DEVICE(USB_VENDOR_ID_CJTOUCH,
+ USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0040) },
+
/* CVTouch panels */
{ .driver_data = MT_CLS_NSMU,
MT_USB_DEVICE(USB_VENDOR_ID_CVTOUCH,
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] HID:multitouch:add driver for CJTouch MultiTouch
2015-07-05 13:56 [PATCH] HID:multitouch:add driver for CJTouch MultiTouch linuxsea
@ 2015-07-06 7:55 ` Benjamin Tissoires
0 siblings, 0 replies; 4+ messages in thread
From: Benjamin Tissoires @ 2015-07-06 7:55 UTC (permalink / raw)
To: linuxsea; +Cc: Jiri Kosina, linux-input, linux-kernel@vger.kernel.org
On Sun, Jul 5, 2015 at 3:56 PM, <linuxsea@163.com> wrote:
> From: Yang Bo <linuxsea@163.com>
>
> Signed-off-by: Yang Bo <linuxsea@163.com>
> ---
> drivers/hid/Kconfig | 1 +
> drivers/hid/hid-ids.h | 4 ++++
> drivers/hid/hid-multitouch.c | 8 ++++++++
> 3 files changed, 13 insertions(+)
>
> diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
> index cc4c664..57c94d7 100644
> --- a/drivers/hid/Kconfig
> +++ b/drivers/hid/Kconfig
> @@ -480,6 +480,7 @@ config HID_MULTITOUCH
> - Atmel panels
> - Cando dual touch panels
> - Chunghwa panels
> + - CJTouch panels
> - CVTouch panels
> - Cypress TrueTouch panels
> - Elan Microelectronics touch panels
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index b04b082..591b7d0 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -236,6 +236,10 @@
>
> #define USB_VENDOR_ID_CIDC 0x1677
>
> +#define USB_VENDOR_ID_CJTOUCH 0x24b8
> +#define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0020 0x0020
> +#define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0040 0x0040
> +
> #define USB_VENDOR_ID_CMEDIA 0x0d8c
> #define USB_DEVICE_ID_CM109 0x000e
>
> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
> index 6a9b05b..5055008 100644
> --- a/drivers/hid/hid-multitouch.c
> +++ b/drivers/hid/hid-multitouch.c
> @@ -1138,6 +1138,14 @@ static const struct hid_device_id mt_devices[] = {
> MT_USB_DEVICE(USB_VENDOR_ID_CHUNGHWAT,
> USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH) },
>
> + /* CJTouch panels */
> + { .driver_data = MT_CLS_DEFAULT,
> + HID_USB_DEVICE(USB_VENDOR_ID_CJTOUCH,
> + USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0020) },
> + { .driver_data = MT_CLS_DEFAULT,
> + HID_USB_DEVICE(USB_VENDOR_ID_CJTOUCH,
> + USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0040) },
> +
Just taking a few minutes while I am still on vacations...
NACK. If the devices work with the MT_CLS_DEFAULT class, there is no
point in adding them in the list of special devices.
This list should only contain the devices that requires special quirks
which is not the case here.
Thanks for the submission though!
Cheers,
Benjamin
> /* CVTouch panels */
> { .driver_data = MT_CLS_NSMU,
> MT_USB_DEVICE(USB_VENDOR_ID_CVTOUCH,
> --
> 1.7.9.5
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] HID:multitouch:add driver for CJTouch MultiTouch
@ 2015-07-20 16:40 linuxsea
2015-07-24 12:57 ` Jiri Kosina
0 siblings, 1 reply; 4+ messages in thread
From: linuxsea @ 2015-07-20 16:40 UTC (permalink / raw)
To: jkosina; +Cc: linux-input, linux-kernel, linuxsea
From: Yang Bo <linuxsea@163.com>
Signed-off-by: Yang Bo <linuxsea@163.com>
---
drivers/hid/Kconfig | 1 +
drivers/hid/hid-ids.h | 4 ++++
drivers/hid/hid-multitouch.c | 8 ++++++++
3 files changed, 13 insertions(+)
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index cc4c664..57c94d7 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -480,6 +480,7 @@ config HID_MULTITOUCH
- Atmel panels
- Cando dual touch panels
- Chunghwa panels
+ - CJTouch panels
- CVTouch panels
- Cypress TrueTouch panels
- Elan Microelectronics touch panels
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index b04b082..591b7d0 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -236,6 +236,10 @@
#define USB_VENDOR_ID_CIDC 0x1677
+#define USB_VENDOR_ID_CJTOUCH 0x24b8
+#define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0020 0x0020
+#define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0040 0x0040
+
#define USB_VENDOR_ID_CMEDIA 0x0d8c
#define USB_DEVICE_ID_CM109 0x000e
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 6a9b05b..ab0434f 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1138,6 +1138,14 @@ static const struct hid_device_id mt_devices[] = {
MT_USB_DEVICE(USB_VENDOR_ID_CHUNGHWAT,
USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH) },
+ /* CJTouch panels */
+ { .driver_data = MT_CLS_NSMU,
+ MT_USB_DEVICE(USB_VENDOR_ID_CJTOUCH,
+ USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0020) },
+ { .driver_data = MT_CLS_NSMU,
+ MT_USB_DEVICE(USB_VENDOR_ID_CJTOUCH,
+ USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0040) },
+
/* CVTouch panels */
{ .driver_data = MT_CLS_NSMU,
MT_USB_DEVICE(USB_VENDOR_ID_CVTOUCH,
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] HID:multitouch:add driver for CJTouch MultiTouch
2015-07-20 16:40 linuxsea
@ 2015-07-24 12:57 ` Jiri Kosina
0 siblings, 0 replies; 4+ messages in thread
From: Jiri Kosina @ 2015-07-24 12:57 UTC (permalink / raw)
To: linuxsea; +Cc: linux-input, linux-kernel
On Mon, 20 Jul 2015, linuxsea@163.com wrote:
> From: Yang Bo <linuxsea@163.com>
>
> Signed-off-by: Yang Bo <linuxsea@163.com>
Please work on improving your changelog-writing skills for your next
submissions.
I've fixed this (provided a very brief changelog) and applied to
for-4.3/multitouch.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-07-24 12:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-05 13:56 [PATCH] HID:multitouch:add driver for CJTouch MultiTouch linuxsea
2015-07-06 7:55 ` Benjamin Tissoires
-- strict thread matches above, loose matches on Subject: below --
2015-07-20 16:40 linuxsea
2015-07-24 12:57 ` Jiri Kosina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).