From patchwork Wed Dec 22 19:33:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping Cheng X-Patchwork-Id: 428391 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 oBMJX6nr026380 for ; Wed, 22 Dec 2010 19:33:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751387Ab0LVTdl (ORCPT ); Wed, 22 Dec 2010 14:33:41 -0500 Received: from mail-yx0-f174.google.com ([209.85.213.174]:51694 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751364Ab0LVTdl (ORCPT ); Wed, 22 Dec 2010 14:33:41 -0500 Received: by yxt3 with SMTP id 3so2337121yxt.19 for ; Wed, 22 Dec 2010 11:33:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=ekGbxHL4lNkEa9JAejXQSh3jl7ZfLW0dSC4bor/EGzA=; b=cyr2V3OpMBbipnKCi6epgXHZzDNRMf2h9jkZzc+i54dt7zXR2bj8Rq3I41UEYNKwrf rtMNwaNQKtzDRId3eGlSN6tScBplhyqmKw2omiLo/o/HxmuD+SmNBERpcZwoCSpiNist mtMKzGZX15oOWHyAQ2K7cfqM5w3oDgE30t9Lw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=JTvKNP70XjmaT46n3DuEKARAYtukIvuWliRA0ah3M8VfZBBGzLP0MvLngtkr7RCdIf TMSrn9g6nLFnOGMLEHB9auJNFxXv/Y4GHachGpLuqOWBUg2rdTz0/l9TVJGgfxp5XFDl MigtZc3s2g2BpUCQZZJxFCGD3PhmAjDVzHKJA= Received: by 10.91.11.15 with SMTP id o15mr9058176agi.206.1293046419069; Wed, 22 Dec 2010 11:33:39 -0800 (PST) Received: from localhost.localdomain ([204.119.25.150]) by mx.google.com with ESMTPS id i10sm11451765anh.32.2010.12.22.11.33.36 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 22 Dec 2010 11:33:37 -0800 (PST) From: Ping Cheng To: linux-input@vger.kernel.org Cc: dmitry.torokhov@gmail.com, Ajay Ramaswamy Subject: [PATCH] Add support for the built-in digitizer in the Lenovo W700 Date: Wed, 22 Dec 2010 11:33:15 -0800 Message-Id: <1293046395-2264-1-git-send-email-pinglinux@gmail.com> X-Mailer: git-send-email 1.7.3.3 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 (demeter1.kernel.org [140.211.167.41]); Wed, 22 Dec 2010 19:33:42 +0000 (UTC) diff --git a/drivers/input/tablet/wacom.h b/drivers/input/tablet/wacom.h index de5adb1..23317bd 100644 --- a/drivers/input/tablet/wacom.h +++ b/drivers/input/tablet/wacom.h @@ -103,6 +103,7 @@ MODULE_DESCRIPTION(DRIVER_DESC); MODULE_LICENSE(DRIVER_LICENSE); #define USB_VENDOR_ID_WACOM 0x056a +#define USB_VENDOR_ID_LENOVO 0x17ef struct wacom { dma_addr_t data_dma; diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index 0b05254..0024d3e 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -1424,11 +1424,17 @@ 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 const struct wacom_features wacom_features_0x6004 = + { "ISD-V4", WACOM_PKGLEN_GRAPHIRE, 12800, 8000, 255, 0, TABLETPC }; #define USB_DEVICE_WACOM(prod) \ USB_DEVICE(USB_VENDOR_ID_WACOM, prod), \ .driver_info = (kernel_ulong_t)&wacom_features_##prod +#define USB_DEVICE_LENOVO(prod) \ + USB_DEVICE(USB_VENDOR_ID_LENOVO, prod), \ + .driver_info = (kernel_ulong_t)&wacom_features_##prod + const struct usb_device_id wacom_ids[] = { { USB_DEVICE_WACOM(0x00) }, { USB_DEVICE_WACOM(0x10) }, @@ -1501,6 +1507,7 @@ const struct usb_device_id wacom_ids[] = { { USB_DEVICE_WACOM(0xE2) }, { USB_DEVICE_WACOM(0xE3) }, { USB_DEVICE_WACOM(0x47) }, + { USB_DEVICE_LENOVO(0x6004) }, { } }; MODULE_DEVICE_TABLE(usb, wacom_ids);