From patchwork Sat Jan 22 07:25:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping Cheng X-Patchwork-Id: 497701 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0M7Q9JC003372 for ; Sat, 22 Jan 2011 07:26:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751346Ab1AVH0H (ORCPT ); Sat, 22 Jan 2011 02:26:07 -0500 Received: from mail-pz0-f46.google.com ([209.85.210.46]:43824 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751317Ab1AVH0H (ORCPT ); Sat, 22 Jan 2011 02:26:07 -0500 Received: by pzk35 with SMTP id 35so414778pzk.19 for ; Fri, 21 Jan 2011 23:26:06 -0800 (PST) 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=CZMfcTzCVra6Zj1dIVFC76SZ3+rBQCtpE99zWp9gfYo=; b=CPBrbojjBAJYGNhc/Rnbnw5hcIJKa2jXdG/EPeR7x/lDf0T6NoxtBrr2191LeBfsW6 ej1ssz28BYrBW1BtlEg+bf6MQUMwqHtWvd8lNaBese+XZ8ObNBFz8DgeZYt2VhL4njZN 2CaaIaJ21pMwazzNkZLQX+4iNgsXlUkklBYxU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=mqz6DbJ6YQqZMudVDqRMEPXZmKhemqIGMEuyX0WngOcW+GO+EtoMoMGNMEgUm6YwdJ PDQF/3Q9LPOnXoPSv7531GksrjATkr39qPOEZtJOdKGSdYlwNqMJGcVlobi0Q6OiEyZd GY960AqutTkD1bYvyfTLkSb2J8Ao6jmChul3U= Received: by 10.142.171.20 with SMTP id t20mr1614626wfe.165.1295681166453; Fri, 21 Jan 2011 23:26:06 -0800 (PST) Received: from localhost.localdomain (c-71-193-252-72.hsd1.wa.comcast.net [71.193.252.72]) by mx.google.com with ESMTPS id y42sm13800374wfd.22.2011.01.21.23.26.04 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 21 Jan 2011 23:26:05 -0800 (PST) From: Ping Cheng To: linux-input@vger.kernel.org Cc: dmitry.torokhov@gmail.com, Ping Cheng , David Foley , Ping Cheng Subject: [PATCH] input : wacom - Add 6 new Bamboo Pen and touch models Date: Fri, 21 Jan 2011 23:25:30 -0800 Message-Id: <1295681130-27188-1-git-send-email-pinglinux@gmail.com> X-Mailer: git-send-email 1.7.3.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 (demeter1.kernel.org [140.211.167.41]); Sat, 22 Jan 2011 07:26:10 +0000 (UTC) diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index 0b05254..4657c02 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -1424,6 +1424,18 @@ static struct wacom_features wacom_features_0xD2 = { "Wacom Bamboo Craft", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 63, BAMBOO_PT }; static struct wacom_features wacom_features_0xD3 = { "Wacom Bamboo 2FG 6x8", WACOM_PKGLEN_BBFUN, 21648, 13530, 1023, 63, BAMBOO_PT }; +static struct wacom_features wacom_features_0xD4 = + { "Wacom Bamboo 4x5", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 63, BAMBOO_PT }; +static struct wacom_features wacom_features_0xD6 = + { "Wacom BambooPT 2FG 4x5", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 63, BAMBOO_PT }; +static struct wacom_features wacom_features_0xD7 = + { "Wacom BambooPT 2FG Small", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 63, BAMBOO_PT }; +static struct wacom_features wacom_features_0xD8 = + { "Wacom Bamboo Comic 2FG", WACOM_PKGLEN_BBFUN, 21648, 13530, 1023, 63, BAMBOO_PT }; +static struct wacom_features wacom_features_0xDA = + { "Wacom Bamboo 2FG 4x5 SE", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, 63, BAMBOO_PT }; +static struct wacom_features wacom_features_0xDB = + { "Wacom Bamboo 2FG 6x8 SE", WACOM_PKGLEN_BBFUN, 21648, 13530, 1023, 63, BAMBOO_PT }; #define USB_DEVICE_WACOM(prod) \ USB_DEVICE(USB_VENDOR_ID_WACOM, prod), \ @@ -1492,6 +1504,12 @@ const struct usb_device_id wacom_ids[] = { { USB_DEVICE_WACOM(0xD1) }, { USB_DEVICE_WACOM(0xD2) }, { USB_DEVICE_WACOM(0xD3) }, + { USB_DEVICE_WACOM(0xD4) }, + { USB_DEVICE_WACOM(0xD6) }, + { USB_DEVICE_WACOM(0xD7) }, + { USB_DEVICE_WACOM(0xD8) }, + { USB_DEVICE_WACOM(0xDA) }, + { USB_DEVICE_WACOM(0xDB) }, { USB_DEVICE_WACOM(0xF0) }, { USB_DEVICE_WACOM(0xCC) }, { USB_DEVICE_WACOM(0x90) },