From patchwork Mon Dec 14 12:50:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 7844371 X-Patchwork-Delegate: jikos@jikos.cz 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A28BB9F1C2 for ; Mon, 14 Dec 2015 13:01:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A600D2035E for ; Mon, 14 Dec 2015 13:01:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7FFAB20351 for ; Mon, 14 Dec 2015 13:01:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932388AbbLNNBs (ORCPT ); Mon, 14 Dec 2015 08:01:48 -0500 Received: from mailgw01.hosei.ac.jp ([133.25.1.21]:54989 "EHLO mailgw01.hosei.ac.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932342AbbLNNBr (ORCPT ); Mon, 14 Dec 2015 08:01:47 -0500 Received: from mail-pf0-f178.google.com (mail-pf0-f178.google.com [209.85.192.178]) by mailgw01.hosei.ac.jp (Postfix) with ESMTP id 458C5128187A for ; Mon, 14 Dec 2015 21:50:43 +0900 (JST) Authentication-Results: mailgw01.hosei.ac.jp; sender-id=none header.from=akihiko.odaki.4i@stu.hosei.ac.jp; spf=none smtp.mfrom=akihiko.odaki.4i@stu.hosei.ac.jp Received: by pfbo64 with SMTP id o64so26529647pfb.1 for ; Mon, 14 Dec 2015 04:50:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=rbLCpioc+PiFJCTtpjYa9T2coigxu8G4O5xIwZ5c8AY=; b=ZtjSR+ss50n+egmLJYIzp3JR8TxOOW1owH+XgklPXX3hFsNBF5etGiaNrXmBhsfCFU pnjglkLe32NmxcvSxBUPNz+o2fnZhEU8BBUNqIsaxk0O/6zzFr2OBMauIangLExNeTOv SkCAwi0R3w/g5uGVCM3Me512iHSDJAKkk9AE7PxLsiSpkmDEyZjLwPOMXSKxLO9JS5xG JOd0ih9IRg/6kBlak2lFik4z6jwp0ij4iawHRF1/pcYp5sd6eEdQXbZoXm2aTAxpBjBm ALlRMStgvgDiUhM3oLC7HZ0SiqQ0cTOg2o+QDwf7mBk1537XsWaYF54wD6M1izcvjaZN u3Bg== X-Gm-Message-State: ALoCoQl8G6vU81s1xqlx7J8ggYyO2V3xFOGGIO5IYfLygPoCkh5Wiq4iV13D8azUcWXxpqYz2kdOOs351a8sL9tCNyWXxC7jEpK7lBQgqYqZJma/YMFEmGGyeJU3/eX6vbuGFQ6/9XDggA7vyhIFBYrUz8vjqfkqaw== X-Received: by 10.98.79.206 with SMTP id f75mr35875970pfj.24.1450097442889; Mon, 14 Dec 2015 04:50:42 -0800 (PST) X-Received: by 10.98.79.206 with SMTP id f75mr35875950pfj.24.1450097442765; Mon, 14 Dec 2015 04:50:42 -0800 (PST) Received: from localhost.localdomain (fp76f0a99c.chbd104.ap.nuro.jp. [118.240.169.156]) by smtp.gmail.com with ESMTPSA id xr8sm42905752pab.26.2015.12.14.04.50.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Dec 2015 04:50:41 -0800 (PST) From: Akihiko Odaki To: jikos@kernel.org Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Akihiko Odaki Subject: [PATCH 1/2] HID: Use multitouch driver for Type Covers Date: Mon, 14 Dec 2015 21:50:28 +0900 Message-Id: <1450097429-4959-1-git-send-email-akihiko.odaki.4i@stu.hosei.ac.jp> X-Mailer: git-send-email 2.6.4 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY, UPPERCASE_50_75 autolearn=unavailable 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 Use multitouch driver instead of microsoft one for Microsoft Surface Type Covers. By using MT_CLS_EXPORT_ALL_INPUTS, the keyboards function as well as the multitouch pads do. Signed-off-by: Akihiko Odaki --- drivers/hid/hid-core.c | 14 -------------- drivers/hid/hid-microsoft.c | 10 ---------- drivers/hid/hid-multitouch.c | 17 +++++++++++++++++ 3 files changed, 17 insertions(+), 24 deletions(-) diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index c6f7a69..43afc55 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -723,15 +723,6 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type) type == HID_COLLECTION_PHYSICAL) hid->group = HID_GROUP_SENSOR_HUB; - if (hid->vendor == USB_VENDOR_ID_MICROSOFT && - (hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 || - hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 || - hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP || - hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3 || - hid->product == USB_DEVICE_ID_MS_POWER_COVER) && - hid->group == HID_GROUP_MULTITOUCH) - hid->group = HID_GROUP_GENERIC; - if ((parser->global.usage_page << 16) == HID_UP_GENDESK) for (i = 0; i < parser->local.usage_index; i++) if (parser->local.usage[i] == HID_GD_POINTER) @@ -1933,11 +1924,6 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB) }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3) }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3) }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER) }, { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) }, { HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL) }, { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) }, diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c index 77a2cf3..0dbc2a0 100644 --- a/drivers/hid/hid-microsoft.c +++ b/drivers/hid/hid-microsoft.c @@ -276,16 +276,6 @@ static const struct hid_device_id ms_devices[] = { .driver_data = MS_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500), .driver_data = MS_DUPLICATE_USAGES }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3), - .driver_data = MS_HIDINPUT }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2), - .driver_data = MS_HIDINPUT }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP), - .driver_data = MS_HIDINPUT }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3), - .driver_data = MS_HIDINPUT }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER), - .driver_data = MS_HIDINPUT }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT), .driver_data = MS_PRESENTER }, diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 3d664d0..dfc2698 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -1330,6 +1330,23 @@ static const struct hid_device_id mt_devices[] = { MT_USB_DEVICE(USB_VENDOR_ID_ILITEK, USB_DEVICE_ID_ILITEK_MULTITOUCH) }, + /* Microsoft Surface Typecover */ + { .driver_data = MT_CLS_EXPORT_ALL_INPUTS, + MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, + USB_DEVICE_ID_MS_TYPE_COVER_PRO_3) }, + { .driver_data = MT_CLS_EXPORT_ALL_INPUTS, + MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, + USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) }, + { .driver_data = MT_CLS_EXPORT_ALL_INPUTS, + MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, + USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) }, + { .driver_data = MT_CLS_EXPORT_ALL_INPUTS, + MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, + USB_DEVICE_ID_MS_TYPE_COVER_3) }, + { .driver_data = MT_CLS_EXPORT_ALL_INPUTS, + MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, + USB_DEVICE_ID_MS_POWER_COVER) }, + /* MosArt panels */ { .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE, MT_USB_DEVICE(USB_VENDOR_ID_ASUS,