From patchwork Thu Aug 19 07:43:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gow X-Patchwork-Id: 120317 X-Patchwork-Delegate: jikos@jikos.cz Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7J7ktdu003997 for ; Thu, 19 Aug 2010 07:46:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751559Ab0HSHqb (ORCPT ); Thu, 19 Aug 2010 03:46:31 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:45550 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751500Ab0HSHqa (ORCPT ); Thu, 19 Aug 2010 03:46:30 -0400 Received: by pwi7 with SMTP id 7so398328pwi.19 for ; Thu, 19 Aug 2010 00:46:29 -0700 (PDT) Received: by 10.142.226.14 with SMTP id y14mr8144518wfg.95.1282203989732; Thu, 19 Aug 2010 00:46:29 -0700 (PDT) Received: from localhost.localdomain (wireless-snat.ucc.gu.uwa.edu.au [130.95.13.142]) by mx.google.com with ESMTPS id w31sm1376441wfd.20.2010.08.19.00.46.24 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 19 Aug 2010 00:46:29 -0700 (PDT) From: David Gow To: jkosina@suse.cz, chatty@enac.fr, dhprince-devel@yahoo.co.uk, dtor@mail.ru, kees.bakker@xs4all.nl, cascardo@holoscopio.com, don@syst.com.br, peter.hutterer@who-t.net, daniel@caiaq.de Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, David Gow Subject: [PATCH] hid: Add support for chicony multitouch screens. Date: Thu, 19 Aug 2010 15:43:56 +0800 Message-Id: <1282203836-5895-1-git-send-email-david@ingeniumdigital.com> X-Mailer: git-send-email 1.7.0.4 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.3 (demeter.kernel.org [140.211.167.41]); Thu, 19 Aug 2010 07:46:55 +0000 (UTC) diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 85c6d13..2905142 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -149,6 +149,7 @@ #define USB_VENDOR_ID_CHICONY 0x04f2 #define USB_DEVICE_ID_CHICONY_TACTICAL_PAD 0x0418 +#define USB_DEVICE_ID_CHICONY_MULTI_TOUCH 0xb19d #define USB_VENDOR_ID_CIDC 0x1677 diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index 2643d31..51ec481 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c @@ -77,6 +77,8 @@ static const struct hid_blacklist { { USB_VENDOR_ID_PI_ENGINEERING, USB_DEVICE_ID_PI_ENGINEERING_VEC_USB_FOOTPEDAL, HID_QUIRK_HIDINPUT_FORCE }, + { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH, HID_QUIRK_MULTI_INPUT }, + { 0, 0 } };