From patchwork Sat Jun 25 00:15:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping Cheng X-Patchwork-Id: 917852 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5P0DrMc022572 for ; Sat, 25 Jun 2011 00:13:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751403Ab1FYANx (ORCPT ); Fri, 24 Jun 2011 20:13:53 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:63584 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750773Ab1FYANw (ORCPT ); Fri, 24 Jun 2011 20:13:52 -0400 Received: by pzk9 with SMTP id 9so2057482pzk.19 for ; Fri, 24 Jun 2011 17:13:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=U5b6A4YbJqqW62crn/Fs2d63lE8mj876aC40gSYHy7E=; b=dhCieoLOa3Cn97zwtBnMY9ICrWS1xy5htR8Wy2iogb1tiIK7PJo6rfNqqOw3L1QG6C qf0dWUaCxLWTP8tCL+PxGSLlMAhuOjEWI1vJCy4xUbsrm3LriR1E+GLWYToS5vo4BtR3 gFLj9v/HHtNsNKCrGxIvbXKcNhDeHTftJVab0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=VHhphsRtiajKIQmqBK0pM98GaMyARBEUXMzbAxa3mrJvaPDf5aEQQJj2QYuxEBZEAk 5QsIm8tkhdMNf34RXdV/8jmy44pQaAZ7vL085r13JDvU6HBuM9bSsubcjIQD5jDf5e59 +ky0vD7Hrl5MMPJhvRVr5TQL8BWsBEXtoiXmY= Received: by 10.68.5.135 with SMTP id s7mr1925684pbs.96.1308960832497; Fri, 24 Jun 2011 17:13:52 -0700 (PDT) Received: from localhost.localdomain ([67.51.163.10]) by mx.google.com with ESMTPS id p5sm2421220pbd.12.2011.06.24.17.13.51 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 24 Jun 2011 17:13:51 -0700 (PDT) From: Ping Cheng To: linux-input@vger.kernel.org Cc: dmitry.torokhov@gmail.com, Ping Cheng , David Foley , Ping Cheng Subject: [PATCH 2/4] input : wacom - Add 3 new models: 6A, 6B, and 97 Date: Fri, 24 Jun 2011 17:15:21 -0700 Message-Id: <1308960921-20473-1-git-send-email-pinglinux@gmail.com> X-Mailer: git-send-email 1.7.5.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.6 (demeter2.kernel.org [140.211.167.43]); Sat, 25 Jun 2011 00:13:54 +0000 (UTC) Tested-by: Alex Tervoort for 6A Signed-off-by: David Foley Signed-off-by: Ping Cheng --- drivers/input/tablet/wacom_wac.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index 1cbb9a8..0c302c9 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -1299,6 +1299,12 @@ static const struct wacom_features wacom_features_0x65 = static const struct wacom_features wacom_features_0x69 = { "Wacom Bamboo1", WACOM_PKGLEN_GRAPHIRE, 5104, 3712, 511, 63, GRAPHIRE, WACOM_PENPRTN_RES, WACOM_PENPRTN_RES }; +static const struct wacom_features wacom_features_0x6A = + { "Wacom Bamboo1 4x6", WACOM_PKGLEN_GRAPHIRE, 14760, 9225, 1023, + 63, GRAPHIRE, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; +static const struct wacom_features wacom_features_0x6B = + { "Wacom Bamboo1 5x8", WACOM_PKGLEN_GRAPHIRE, 21648, 13530, 1023, + 63, GRAPHIRE, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; static const struct wacom_features wacom_features_0x20 = { "Wacom Intuos 4x5", WACOM_PKGLEN_INTUOS, 12700, 10600, 1023, 31, INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; @@ -1431,6 +1437,9 @@ static const struct wacom_features wacom_features_0x90 = static const struct wacom_features wacom_features_0x93 = { "Wacom ISDv4 93", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 255, 0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; +static const struct wacom_features wacom_features_0x97 = + { "Wacom ISDv4 97", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 511, + 0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; static const struct wacom_features wacom_features_0x9A = { "Wacom ISDv4 9A", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 255, 0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; @@ -1515,6 +1524,8 @@ const struct usb_device_id wacom_ids[] = { { USB_DEVICE_WACOM(0x64) }, { USB_DEVICE_WACOM(0x65) }, { USB_DEVICE_WACOM(0x69) }, + { USB_DEVICE_WACOM(0x6A) }, + { USB_DEVICE_WACOM(0x6B) }, { USB_DEVICE_WACOM(0x20) }, { USB_DEVICE_WACOM(0x21) }, { USB_DEVICE_WACOM(0x22) }, @@ -1575,6 +1586,7 @@ const struct usb_device_id wacom_ids[] = { { USB_DEVICE_WACOM(0xCC) }, { USB_DEVICE_WACOM(0x90) }, { USB_DEVICE_WACOM(0x93) }, + { USB_DEVICE_WACOM(0x97) }, { USB_DEVICE_WACOM(0x9A) }, { USB_DEVICE_WACOM(0x9F) }, { USB_DEVICE_WACOM(0xE2) },