From patchwork Mon May 9 15:54:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Austin Zhang X-Patchwork-Id: 769642 X-Patchwork-Delegate: jikos@jikos.cz Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p49FphGI025414 for ; Mon, 9 May 2011 15:54:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752105Ab1EIPyP (ORCPT ); Mon, 9 May 2011 11:54:15 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:55719 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752319Ab1EIPyP (ORCPT ); Mon, 9 May 2011 11:54:15 -0400 Received: by pvg12 with SMTP id 12so2406625pvg.19 for ; Mon, 09 May 2011 08:54:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:date:message-id:subject:from:to:cc :content-type; bh=sPgG+blX0tRqEh99MeR1XesnPDcqkQvDzTQFDyUsJlY=; b=nG9iKAUMXf/ZecDX4Dzujb9ktS3ebClUk29LQ2Zvv9o6HUf1h+OSylxQsGeq7WWv/P LZg0WNdPurwJY4sUm/b5EuX5ftNXA8D48qoszDoaX0CT99gpklbhZThJWOmWEqojrzxM rYHzsHToMTiJrav7lPnZNpsIvX1p0uXSM1V5U= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type; b=l2/cDC9Gm9xWoKc/1KK4XUFfMzxbq/19VHY+gHWQ83RLIeCxXAjU4VMmlZ15meWxnz jC56BNeaV0LaFkHKO7iqjD8hxRiT8arNEB2fWBBTg+4ufVkLILIlEYkub000C+Kl117I YE4zfj8Sep7P3oFvbXKrug9ZXwdbvJobqnF4E= MIME-Version: 1.0 Received: by 10.68.29.234 with SMTP id n10mr9397069pbh.94.1304956454805; Mon, 09 May 2011 08:54:14 -0700 (PDT) Received: by 10.68.62.162 with HTTP; Mon, 9 May 2011 08:54:14 -0700 (PDT) Date: Mon, 9 May 2011 23:54:14 +0800 Message-ID: Subject: HID: hid-multitouch: add support for Ilitek dual-touch panel From: Austin Zhang To: linux-input@vger.kernel.org, jkosina@suse.cz, dmitry.torokhov@gmail.com Cc: Benjamin Tissoires Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 09 May 2011 15:54:16 +0000 (UTC) Added ILITEK hid dual touch panel support into hid-multitouch. Signed-off-by: Austin Zhang Reviewed-by: Benjamin Tissoires --- 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 diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index d2d4e5f..d9635d6 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -306,6 +306,7 @@ config HID_MULTITOUCH - Cando dual touch panel - Cypress TrueTouch panels - Hanvon dual touch panels + - Ilitek dual touch panel - IrTouch Infrared USB panels - MosArt dual-touch panels - PenMount dual touch panels diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 6e31b9f..c0ea857 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1377,6 +1377,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) }, { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) }, { HID_USB_DEVICE(USB_VENDOR_ID_HANVON, USB_DEVICE_ID_HANVON_MULTITOUCH) }, + { HID_USB_DEVICE(USB_VENDOR_ID_ILITEK, USB_DEVICE_ID_ILITEK_MULTITOUCH) }, { HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS, USB_DEVICE_ID_IRTOUCH_INFRARED_USB) }, { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) }, { HID_USB_DEVICE(USB_VENDOR_ID_KEYTOUCH, USB_DEVICE_ID_KEYTOUCH_IEC) }, diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 252aeba..0f29b3f 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -330,6 +330,9 @@ #define USB_DEVICE_ID_UGCI_FLYING 0x0020 #define USB_DEVICE_ID_UGCI_FIGHTING 0x0030 +#define USB_VENDOR_ID_ILITEK 0x222a +#define USB_DEVICE_ID_ILITEK_MULTITOUCH 0x0001 + #define USB_VENDOR_ID_IMATION 0x0718 #define USB_DEVICE_ID_DISC_STAKKA 0xd000 diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index bf46804..b21251b 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -589,6 +589,11 @@ static const struct hid_device_id mt_devices[] = { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS) }, + /* Ilitek dual touch panel */ + { .driver_data = MT_CLS_DEFAULT, + HID_USB_DEVICE(USB_VENDOR_ID_ILITEK, + USB_DEVICE_ID_ILITEK_MULTITOUCH) }, + /* IRTOUCH panels */ { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTID, HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS,