From patchwork Sun Jul 5 13:56:52 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: 6718481 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 482E79F2F0 for ; Sun, 5 Jul 2015 13:57:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1A1552060A for ; Sun, 5 Jul 2015 13:57:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C770D20609 for ; Sun, 5 Jul 2015 13:57:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751910AbbGEN5N (ORCPT ); Sun, 5 Jul 2015 09:57:13 -0400 Received: from m12-12.163.com ([220.181.12.12]:37309 "EHLO m12-12.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751025AbbGEN5M (ORCPT ); Sun, 5 Jul 2015 09:57:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=CoeuMJEoJm738IDVMv mYKtQ2eHoxAmXfV1UsTVSDi3w=; b=Okk+8ntXIlLhUW+LQe5uLwur+bs60ND4CF GnfoE1afWwr4mPzLNWriXx20ke6jSINLolnXDbhpx9Gh62T2GboR7eROlDp8P2uL IQS+WiPgTxD+RLZo1mLgr/dp+PdoWzGOcT02P7OzrIEmg2W1usuq20YJ6YOANCh1 /mvlkFBGw= Received: from localhost (unknown [42.48.247.128]) by smtp8 (Coremail) with SMTP id DMCowED5eUamN5lV_flCDw--.23653S2; Sun, 05 Jul 2015 21:56:56 +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 for CJTouch MultiTouch Date: Sun, 5 Jul 2015 06:56:52 -0700 Message-Id: <1436104612-3357-1-git-send-email-linuxsea@163.com> X-Mailer: git-send-email 1.7.9.5 X-CM-TRANSID: DMCowED5eUamN5lV_flCDw--.23653S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxJrW8CF1xCFyktryUWr4Durg_yoW8Aw47pa 15JrWYvrWDGF4rCw1qkr4kua45Jan7KFWI9FZrCa1ruFWUAFWDZrn0yFZrAr15ZFsxJasF grnY93y7Ga4UtwUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UzMKNUUUUU= X-Originating-IP: [42.48.247.128] X-CM-SenderInfo: polq35xvhdqiywtou0bp/xtbBZAsugFQGzz8vawAAsn 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: Yang Bo Signed-off-by: Yang Bo --- 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,