From patchwork Mon Jun 29 17:04:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: linuxsea@163.com X-Patchwork-Id: 6690331 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B7C929F1C1 for ; Mon, 29 Jun 2015 17:05:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D942320588 for ; Mon, 29 Jun 2015 17:05:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D68FB20585 for ; Mon, 29 Jun 2015 17:05:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753018AbbF2RFc (ORCPT ); Mon, 29 Jun 2015 13:05:32 -0400 Received: from m12-14.163.com ([220.181.12.14]:48065 "EHLO m12-14.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751159AbbF2RFb (ORCPT ); Mon, 29 Jun 2015 13:05:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=W0QyrjJYKIw6BuqJxA XQ9i84NXkKioz7yAX/tMIWJns=; b=otlzYXfaeGnpcv0y/15KDuPhjoi5+VhTt/ lEgDzNApMo5zIlPF5c6I6spX9nk2ApNjyGFcxJLTpJJPSJvBL0PRSKcyXYA4EFRn GxpfGU1dtGXhKz++kASAwG0vBTN1OUNpf8mO6rWFiLv6NbNYwovyp0qot4hQuIyG U0i+/d7Z8= Received: from localhost (unknown [125.39.161.226]) by smtp10 (Coremail) with SMTP id DsCowEAZJ0HSepFVagk+Dg--.58900S2; Tue, 30 Jun 2015 01:05:24 +0800 (CST) From: linuxsea@163.com To: jkosina@suse.cz Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linuxsea@163.com Subject: [PATCH] HID:multitouch:add driver fo CJTouch MultiTouch Date: Mon, 29 Jun 2015 10:04:50 -0700 Message-Id: <1435597490-3727-1-git-send-email-linuxsea@163.com> X-Mailer: git-send-email 1.7.9.5 X-CM-TRANSID: DsCowEAZJ0HSepFVagk+Dg--.58900S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxJrWUKF15ArW3WF1kXw13Arb_yoW8Cr18pw 45JrWYvrWDGr4rCw1qkr4kua45Jan7KFWI9FZrCa1ruFWUAFWDZFn0yFZrAr15AFsxJasF grnY93y7Ga4UtwUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UjLv_UUUUU= X-Originating-IP: [125.39.161.226] X-CM-SenderInfo: polq35xvhdqiywtou0bp/1tbiVBQogFUL3utoXwAAs0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: linuxsea Signed-off-by:linuxsea --- --- 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,