From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15245C4CECD for ; Tue, 17 Sep 2019 09:37:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E5BE42189D for ; Tue, 17 Sep 2019 09:37:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728153AbfIQJhf (ORCPT ); Tue, 17 Sep 2019 05:37:35 -0400 Received: from esa4.mentor.iphmx.com ([68.232.137.252]:22003 "EHLO esa4.mentor.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725901AbfIQJhe (ORCPT ); Tue, 17 Sep 2019 05:37:34 -0400 IronPort-SDR: f81VCh94+u1ugFEew6iX4wP8U6bALzCxW/hkhAzv8Px5H8AJbLOUXI4OBPKX3OiCA2sm7MKE6p QEpgzmFWM1FIqx3VuJu4dBRE34Sw90LWxDYKyqkI5IXF8Jk4ot685aCjac/NDmDMlQLBN7hVbq KvVh4UTDJ8L4dbx5CHH7SVweoSZmzA6zPXwy0XETCKRaHT50TtIB/8i0VKs4DUR/ejDgV2uJym KXfqiYed+MF9wNlDWSzheFRHlWKZKEhybHWO2v9C9bwsmFnElruLI6180pb1tKDfDAWD+In/Lm mVU= X-IronPort-AV: E=Sophos;i="5.64,515,1559548800"; d="scan'208";a="41423042" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 17 Sep 2019 01:37:34 -0800 IronPort-SDR: ajMO0UBwfGU5rRvIM7SrBpNJ4gw2stQjAb4qHqNkvAgIeg6/nGFfHl8pxSpRtcs21ZcO7P+YTp 0GHW5eYexeyXvnQAwoOIo90PtIBHUlojUJkX1+tJO+zbWrhvTy1CLULFKCG96Kmfs/A1QMJFF7 y0XVbMJEQTRmuBTIPtanSNS5j/KA1wCDhW3xSo3HFeFfbPhrmA+rbiK10+knKA1GuKich9pQT0 C8LUF7FYWAAaRZYAnxqwBZE4wz0FZuFTA0Dr5bqvBM1BR+yrq5DpOxll2aiw59N2DVnY+WiGaJ mjU= From: Jiada Wang To: , , , , CC: , , Subject: [PATCH v3 10/49] Input: atmel_mxt_ts - handle reports from T47 Stylus object Date: Tue, 17 Sep 2019 18:36:25 +0900 Message-ID: <20190917093704.18439-1-jiada_wang@mentor.com> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-ClientProxiedBy: SVR-ORW-MBX-09.mgc.mentorg.com (147.34.90.209) To svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nick Dyer Signed-off-by: Nick Dyer Acked-by: Benson Leung Acked-by: Yufeng Shen (cherry picked from ndyer/linux/for-upstream commit 56405a5ea08eb34cfe83f3121867c9de0a5c48c1) Signed-off-by: George G. Davis Signed-off-by: Jiada Wang --- drivers/input/touchscreen/atmel_mxt_ts.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 1d738c488bdd..83dad225458e 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -823,6 +823,7 @@ static void mxt_proc_t9_message(struct mxt_data *data, u8 *message) int area; int amplitude; u8 vector; + int tool; id = message[0] - data->T9_reportid_min; status = message[1]; @@ -836,6 +837,7 @@ static void mxt_proc_t9_message(struct mxt_data *data, u8 *message) y >>= 2; area = message[5]; + amplitude = message[6]; vector = message[7]; @@ -865,12 +867,20 @@ static void mxt_proc_t9_message(struct mxt_data *data, u8 *message) mxt_input_sync(data); } + /* A size of zero indicates touch is from a linked T47 Stylus */ + if (area == 0) { + area = MXT_TOUCH_MAJOR_DEFAULT; + tool = MT_TOOL_PEN; + } else { + tool = MT_TOOL_FINGER; + } + /* if active, pressure must be non-zero */ if (!amplitude) amplitude = MXT_PRESSURE_DEFAULT; /* Touch active */ - input_mt_report_slot_state(input_dev, MT_TOOL_FINGER, 1); + input_mt_report_slot_state(input_dev, tool, 1); input_report_abs(input_dev, ABS_MT_POSITION_X, x); input_report_abs(input_dev, ABS_MT_POSITION_Y, y); input_report_abs(input_dev, ABS_MT_PRESSURE, amplitude); -- 2.19.2