From patchwork Wed Jul 11 17:16:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gerecke, Jason" X-Patchwork-Id: 1184501 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 182EB3FC5A for ; Wed, 11 Jul 2012 17:16:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751282Ab2GKRQX (ORCPT ); Wed, 11 Jul 2012 13:16:23 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:63109 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750962Ab2GKRQW (ORCPT ); Wed, 11 Jul 2012 13:16:22 -0400 Received: by gglu4 with SMTP id u4so1466409ggl.19 for ; Wed, 11 Jul 2012 10:16:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=pDbnAxl5tW+8npbV3Uab2b5CLXjEYin65QLZkRdyBwY=; b=KvV590agxoDidhqgAWOiC4+4o4QrSiBqO4rf2mNuZibbWg8hVNb2Ck6Mn2i4i4YRlm f4xm/1wJtohCfsOPve+zoAHk+gIUe8dL5Ax9mC+ZSaYUNYjL0LmAhRedRbfU4VLyU4fl 37nyLHIexYQCsBE3d8P4qbUbxIMFOzTo6w2kq4MP7S8Y9tersRI76R4calTqK3AQbfCQ YSB0loG7BynxHuBlBIbXc5iIlM5wjO/tN0Cq0RB+FsEw+KkaG+7MJ6xl1e8IwvL1+l7x 8Zer2mOYUixeP5EXIpAgA5PvDBsTxEQ6XC42DO15EoZeTqcMWn4BK0szAQXmJh6S+Mx/ +U1g== Received: by 10.66.81.232 with SMTP id d8mr48501103pay.66.1342026981396; Wed, 11 Jul 2012 10:16:21 -0700 (PDT) Received: from wacom-arch.wacom.com ([67.51.163.2]) by mx.google.com with ESMTPS id ru4sm2049438pbc.66.2012.07.11.10.16.19 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Jul 2012 10:16:20 -0700 (PDT) From: Jason Gerecke To: linux-input@vger.kernel.org Cc: Jason Gerecke Subject: [PATCH] Input: wacom: Add support for EMR on Cintiq 24HD touch Date: Wed, 11 Jul 2012 10:16:05 -0700 Message-Id: <1342026965-1331-1-git-send-email-killertofu@gmail.com> X-Mailer: git-send-email 1.7.11.1 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Adds support for the EMR digitizer on the Cintiq 24HD touch. The EMR digitizer should work identically to that found on the Cintiq 24HD. The touch digitizer is a separate USB device similar to how we split apart some other devices. Signed-off-by: Jason Gerecke --- NOTE: If you're wondering where the patches for touch are, I'll be submitting them once I can get my hands on a unit to test against (touch uses a new packet format, unlike the EMR interface). Since the addition of touch isn't the sole reason to buy this model, it makes sense to support at least the EMR in the mean time. drivers/input/tablet/wacom_wac.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index 6533f44..51c7208 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -1835,7 +1835,10 @@ static const struct wacom_features wacom_features_0x2A = { "Wacom Intuos5 M", WACOM_PKGLEN_INTUOS, 44704, 27940, 2047, 63, INTUOS5, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES }; static const struct wacom_features wacom_features_0xF4 = - { "Wacom Cintiq 24HD", WACOM_PKGLEN_INTUOS, 104480, 65600, 2047, + { "Wacom Cintiq 24HD", WACOM_PKGLEN_INTUOS, 104480, 65600, 2047, + 63, WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES }; +static const struct wacom_features wacom_features_0xF8 = + { "Wacom Cintiq 24HD touch", WACOM_PKGLEN_INTUOS, 104480, 65600, 2047, 63, WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES }; static const struct wacom_features wacom_features_0x3F = { "Wacom Cintiq 21UX", WACOM_PKGLEN_INTUOS, 87200, 65600, 1023, @@ -2075,6 +2078,7 @@ const struct usb_device_id wacom_ids[] = { { USB_DEVICE_WACOM(0xEF) }, { USB_DEVICE_WACOM(0x47) }, { USB_DEVICE_WACOM(0xF4) }, + { USB_DEVICE_WACOM(0xF8) }, { USB_DEVICE_LENOVO(0x6004) }, { } };