From patchwork Wed Jun 21 02:43:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei-Ning Huang X-Patchwork-Id: 9800583 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DA3766038C for ; Wed, 21 Jun 2017 02:49:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C450F269A3 for ; Wed, 21 Jun 2017 02:49:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B90C626E49; Wed, 21 Jun 2017 02:49:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 578CF269A3 for ; Wed, 21 Jun 2017 02:49:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753128AbdFUCs6 (ORCPT ); Tue, 20 Jun 2017 22:48:58 -0400 Received: from mail-pg0-f54.google.com ([74.125.83.54]:35675 "EHLO mail-pg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753108AbdFUCsq (ORCPT ); Tue, 20 Jun 2017 22:48:46 -0400 Received: by mail-pg0-f54.google.com with SMTP id 132so37450050pgb.2 for ; Tue, 20 Jun 2017 19:48:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=LHM+24kSNn9Zi8Kvxrp1msYmVcucEb/OiRd7r+Gofkk=; b=a0uFlxaDsGg6yE2mARkj22Yxfpcigtdccyo77usOerPFM4mIK6kzE6NBsfxSxXdP7k 132x4MVlUjZGcb+fp01jSpsjgZRXSbK2+i7Gx63c7d9qlUpQp/OBE12gRcnqFl1D02h+ 5gTfPpuLG6cmayuv6azOIPprPZTETE28PCQtU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=LHM+24kSNn9Zi8Kvxrp1msYmVcucEb/OiRd7r+Gofkk=; b=Tz5pRVrCa0Isvlq3XjIlG/UW01tzGizmI4MtI2AH/I1+YIx8sTsluTxXjmwSG3Ah8+ CqkIOuuYS/NYHrVpkofPfdpH7CpK9PbB5Qabe+qIBrMxuhvB0tpHfyI3lva9j2eR/IQz SeV5HOgPtis+eAl1RsMgfyRwJT4gjv6Mvyrg+q3GVKU9hLyxLqd3L7T7/5iETq5eNT7c 3hh239S7QlvFGM/cZFTlvzFfzHQsx92dKRsbyXXaHRxhjA+uQlyJzVwLfMuGsPXZup3l Osay/TR+W+qMo6E6sQp37RaqjWkNRdY6AxOnhYlU8MOu8/i2AZwe7T8fYjgRFrNhGrLr W2tA== X-Gm-Message-State: AKS2vOwY6btQBmNEEqn5NYDEq/52sG3LsZJiwGlauQeOvK8LXwk3cYSp XKOEqwURx+r55PfX X-Received: by 10.99.165.17 with SMTP id n17mr33189865pgf.163.1498013325794; Tue, 20 Jun 2017 19:48:45 -0700 (PDT) Received: from localhost.localdomain ([172.26.48.160]) by smtp.gmail.com with ESMTPSA id v3sm30326926pfi.73.2017.06.20.19.48.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Jun 2017 19:48:44 -0700 (PDT) From: Wei-Ning Huang To: LKML Cc: Andrew de los Reyes , Shecky Lin , Rong Chang , Wei-Ning Huang , jikos@kernel.org, benjamin.tissoires@redhat.com, linux-input@vger.kernel.org Subject: [PATCH] HID: multitouch: Add support for Google Rose Touchpad Date: Wed, 21 Jun 2017 10:43:25 +0800 Message-Id: <20170621024325.37966-1-wnhuang@chromium.org> X-Mailer: git-send-email 2.12.2 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add Google Rose Touchpad USB PID and required quirks. Signed-off-by: Wei-Ning Huang Reviewed-by: Benjamin Tissoires --- drivers/hid/hid-ids.h | 3 +++ drivers/hid/hid-multitouch.c | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 8ca1e8ce0af2..91c4a89615d7 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -425,6 +425,9 @@ #define USB_VENDOR_ID_GOODTOUCH 0x1aad #define USB_DEVICE_ID_GOODTOUCH_000f 0x000f +#define USB_VENDOR_ID_GOOGLE 0x18d1 +#define USB_DEVICE_ID_GOOGLE_TOUCH_ROSE 0x5028 + #define USB_VENDOR_ID_GOTOP 0x08f2 #define USB_DEVICE_ID_SUPER_Q2 0x007f #define USB_DEVICE_ID_GOGOPEN 0x00ce diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 24d5b6deb571..5052aca8b984 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -161,6 +161,7 @@ static void mt_post_parse(struct mt_device *td); #define MT_CLS_GENERALTOUCH_PWT_TENFINGERS 0x0109 #define MT_CLS_LG 0x010a #define MT_CLS_VTL 0x0110 +#define MT_CLS_GOOGLE 0x0111 #define MT_DEFAULT_MAXCONTACT 10 #define MT_MAX_MAXCONTACT 250 @@ -278,6 +279,12 @@ static struct mt_class mt_classes[] = { MT_QUIRK_CONTACT_CNT_ACCURATE | MT_QUIRK_FORCE_GET_FEATURE, }, + { .name = MT_CLS_GOOGLE, + .quirks = MT_QUIRK_ALWAYS_VALID | + MT_QUIRK_CONTACT_CNT_ACCURATE | + MT_QUIRK_SLOT_IS_CONTACTID | + MT_QUIRK_HOVERING + }, { } }; @@ -1569,6 +1576,11 @@ static const struct hid_device_id mt_devices[] = { MT_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_CSR2) }, + /* Google MT devices */ + { .driver_data = MT_CLS_GOOGLE, + HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE, + USB_DEVICE_ID_GOOGLE_TOUCH_ROSE) }, + /* Generic MT device */ { HID_DEVICE(HID_BUS_ANY, HID_GROUP_MULTITOUCH, HID_ANY_ID, HID_ANY_ID) },