| Message ID | 1306519427-5425-1-git-send-email-zhang.austin@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 942fd4225f72826b31d893582b6ae7e172bb3202 |
| Headers | show |
Hi, Reviewed-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Thanks for the work, Benjamin On Fri, May 27, 2011 at 20:03, Austin Zhang <zhang.austin@gmail.com> wrote: > Added Chunghwa hid multitouch panel support into hid-multitouch. > > Signed-off-by: Austin Zhang <zhang.austin@gmail.com> > --- > Kconfig | 1 + > hid-core.c | 1 + > hid-ids.h | 3 +++ > hid-multitouch.c | 5 +++++ > 4 files changed, 10 insertions(+) > > diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig > index 67d2a75..36ca465 100644 > --- a/drivers/hid/Kconfig > +++ b/drivers/hid/Kconfig > @@ -305,6 +305,7 @@ config HID_MULTITOUCH > - 3M PCT touch screens > - ActionStar dual touch panels > - Cando dual touch panels > + - Chunghwa panels > - CVTouch panels > - Cypress TrueTouch panels > - Elo TouchSystems IntelliTouch Plus panels > diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c > index c957c4b..f7440e8 100644 > --- a/drivers/hid/hid-core.c > +++ b/drivers/hid/hid-core.c > @@ -1359,6 +1359,7 @@ static const struct hid_device_id hid_have_special_driver[] = { > { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR) }, > { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) }, > { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS) }, > + { HID_USB_DEVICE(USB_VENDOR_ID_CHUNGHWAT, USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH) }, > { HID_USB_DEVICE(USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_PRODIKEYS_PCMIDI) }, > { HID_USB_DEVICE(USB_VENDOR_ID_CVTOUCH, USB_DEVICE_ID_CVTOUCH_SCREEN) }, > { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) }, > diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h > index 0b374a6..82be975 100644 > --- a/drivers/hid/hid-ids.h > +++ b/drivers/hid/hid-ids.h > @@ -173,6 +173,9 @@ > #define USB_DEVICE_ID_CHICONY_MULTI_TOUCH 0xb19d > #define USB_DEVICE_ID_CHICONY_WIRELESS 0x0618 > > +#define USB_VENDOR_ID_CHUNGHWAT 0x2247 > +#define USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH 0x0001 > + > #define USB_VENDOR_ID_CIDC 0x1677 > > #define USB_VENDOR_ID_CMEDIA 0x0d8c > diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c > index ecd4d2d..8bc32a0 100644 > --- a/drivers/hid/hid-multitouch.c > +++ b/drivers/hid/hid-multitouch.c > @@ -593,6 +593,11 @@ static const struct hid_device_id mt_devices[] = { > HID_USB_DEVICE(USB_VENDOR_ID_CANDO, > USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) }, > > + /* Chunghwa Telecom touch panels */ > + { .driver_data = MT_CLS_DEFAULT, > + HID_USB_DEVICE(USB_VENDOR_ID_CHUNGHWAT, > + USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH) }, > + > /* CVTouch panels */ > { .driver_data = MT_CLS_DEFAULT, > HID_USB_DEVICE(USB_VENDOR_ID_CVTOUCH, > -- 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 --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 67d2a75..36ca465 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -305,6 +305,7 @@ config HID_MULTITOUCH - 3M PCT touch screens - ActionStar dual touch panels - Cando dual touch panels + - Chunghwa panels - CVTouch panels - Cypress TrueTouch panels - Elo TouchSystems IntelliTouch Plus panels diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index c957c4b..f7440e8 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1359,6 +1359,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR) }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS) }, + { HID_USB_DEVICE(USB_VENDOR_ID_CHUNGHWAT, USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH) }, { HID_USB_DEVICE(USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_PRODIKEYS_PCMIDI) }, { HID_USB_DEVICE(USB_VENDOR_ID_CVTOUCH, USB_DEVICE_ID_CVTOUCH_SCREEN) }, { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) }, diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 0b374a6..82be975 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -173,6 +173,9 @@ #define USB_DEVICE_ID_CHICONY_MULTI_TOUCH 0xb19d #define USB_DEVICE_ID_CHICONY_WIRELESS 0x0618 +#define USB_VENDOR_ID_CHUNGHWAT 0x2247 +#define USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH 0x0001 + #define USB_VENDOR_ID_CIDC 0x1677 #define USB_VENDOR_ID_CMEDIA 0x0d8c diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index ecd4d2d..8bc32a0 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -593,6 +593,11 @@ static const struct hid_device_id mt_devices[] = { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) }, + /* Chunghwa Telecom touch panels */ + { .driver_data = MT_CLS_DEFAULT, + HID_USB_DEVICE(USB_VENDOR_ID_CHUNGHWAT, + USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH) }, + /* CVTouch panels */ { .driver_data = MT_CLS_DEFAULT, HID_USB_DEVICE(USB_VENDOR_ID_CVTOUCH,
Added Chunghwa hid multitouch panel support into hid-multitouch. Signed-off-by: Austin Zhang <zhang.austin@gmail.com> --- Kconfig | 1 + hid-core.c | 1 + hid-ids.h | 3 +++ hid-multitouch.c | 5 +++++ 4 files changed, 10 insertions(+) -- 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