From patchwork Mon Jun 30 21:46:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gerecke, Jason" X-Patchwork-Id: 4454761 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 452339F73E for ; Mon, 30 Jun 2014 21:47:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 85DA9203E5 for ; Mon, 30 Jun 2014 21:47:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 187D4203DA for ; Mon, 30 Jun 2014 21:47:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755530AbaF3Vqz (ORCPT ); Mon, 30 Jun 2014 17:46:55 -0400 Received: from mail-pd0-f180.google.com ([209.85.192.180]:48446 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751425AbaF3Vqx (ORCPT ); Mon, 30 Jun 2014 17:46:53 -0400 Received: by mail-pd0-f180.google.com with SMTP id fp1so8928300pdb.39 for ; Mon, 30 Jun 2014 14:46:53 -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:in-reply-to:references; bh=n4ZeDGX85vQZhsezB74qa4IQplelrHJN3E3Yz9PMpOU=; b=VaqrE+AN5PZ1T3SrHKHHho2Jv9/i+QgLbELjgBgo652AFkYJ7UUt/sfzsltjTOUpPj K1UsORDgSMRy5ZeRtwZPWsUUMT24YWHniZjwysKfRrl1deCtoCezGO2990aknutEUYeB 4TaEfNEWLVVtZKdzlvdvtjlaTN+e8AA+k+8y19JhRNGTW2GtAjNIEc8Erwkh/v3EzusC LVt5w8xLmrnNFE2lT+cu24JhiJbBRr8At+OXBiC1vD/cjfYLM8ChJKJ9eUi/5NE8+K6T zXybKBP4XknX5q8OC70yMnFr9YKMr2Het5V7CWNlJlhQl2oiBgw/fHb40z+DhyxHEo/B 9c4A== X-Received: by 10.68.110.65 with SMTP id hy1mr54945287pbb.67.1404164813221; Mon, 30 Jun 2014 14:46:53 -0700 (PDT) Received: from localhost.localdomain ([67.51.163.2]) by mx.google.com with ESMTPSA id ee5sm29331850pbc.47.2014.06.30.14.46.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Jun 2014 14:46:52 -0700 (PDT) From: Jason Gerecke To: linux-input@vger.kernel.org, pinglinux@gmail.com, dmitry.torokhov@gmail.com Cc: Jason Gerecke Subject: [PATCH 2/2] input: wacom: Add support for 0x12C ISDv4 sensor Date: Mon, 30 Jun 2014 14:46:46 -0700 Message-Id: <1404164806-5141-2-git-send-email-killertofu@gmail.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1404164806-5141-1-git-send-email-killertofu@gmail.com> References: <1404164806-5141-1-git-send-email-killertofu@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 Signed-off-by: Jason Gerecke --- drivers/input/tablet/wacom_wac.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index 61a45a5..58022ff 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -2248,6 +2248,9 @@ static const struct wacom_features wacom_features_0x10F = static const struct wacom_features wacom_features_0x116 = { "Wacom ISDv4 116", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 255, 0, TABLETPCE, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; +static const struct wacom_features wacom_features_0x12C = + { "Wacom ISDv4 12C", WACOM_PKGLEN_GRAPHIRE, 27848, 15752, 2047, + 0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; static const struct wacom_features wacom_features_0x4001 = { "Wacom ISDv4 4001", WACOM_PKGLEN_MTTPC, 26202, 16325, 255, 0, MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; @@ -2472,6 +2475,7 @@ const struct usb_device_id wacom_ids[] = { { USB_DEVICE_WACOM(0x10E) }, { USB_DEVICE_WACOM(0x10F) }, { USB_DEVICE_WACOM(0x116) }, + { USB_DEVICE_WACOM(0x12C) }, { USB_DEVICE_WACOM(0x300) }, { USB_DEVICE_WACOM(0x301) }, { USB_DEVICE_DETAILED(0x302, USB_CLASS_HID, 0, 0) },