From patchwork Wed Mar 25 13:32:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 208037 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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, UNWANTED_LANGUAGE_BODY,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 4A7E0C1975A for ; Wed, 25 Mar 2020 13:34:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2879D207FC for ; Wed, 25 Mar 2020 13:34:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727552AbgCYNeC (ORCPT ); Wed, 25 Mar 2020 09:34:02 -0400 Received: from esa1.mentor.iphmx.com ([68.232.129.153]:4295 "EHLO esa1.mentor.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727114AbgCYNeC (ORCPT ); Wed, 25 Mar 2020 09:34:02 -0400 IronPort-SDR: L3ZWGgLv4j+fLx6+qsdaXnxjZXaQ0Smw3h0SAAyCETEFFMk5CF9aAlr5+5Bs2txO8XvIoYgTwm 7UuHktQZ6aA9/f1uY3layF/6FmR3xbuaQa0ETuJNbrJiZPkLKlqg+zyZpujC468nsKCw1aTiv7 tB2t0+8aCgodVZMb1yWdeN3oe79CnOPaSdXjHoXxwSLn4k0bRhFylpCCxgWl5cRmXIxlRsbGoS g6/4dMhhpT9PqD50FgJCsUwtcbvlWOB/EiW9dFbFRGa74u3XQ+bKPG+aYpTeoBnziSSWf6iO9i xEg= X-IronPort-AV: E=Sophos;i="5.72,304,1580803200"; d="scan'208";a="49059995" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa1.mentor.iphmx.com with ESMTP; 25 Mar 2020 05:34:00 -0800 IronPort-SDR: QMTO7kEnIStBeE7EjT3v+Q5rXhw4QCktuizwsVAXhdRBv2L/wSgzvDg8ku7AsQv51t3+6nYJed mQTtV6GTuV8B10itnz+t+CS8TrpE3Y8pC6or3ggtrdus1b5X4KST3FBmpOjXxIZn6GG4Yl7ptl DmPMB7c1vmgZyQElQrSrz6hAtAY3vKvhrEwqoZXnacUFRHOSGt8oD01jZVOYXwUFjAuvF/Pxp+ BZvHXMJHOrLjaOA7xSVq/ULJsKO30U8RBOxViPKpUJG0ZTeZ6ccTPsKinHkhdTyIo+rzp1b+fK mUM= From: Jiada Wang To: , , , , , CC: , , , , Subject: [PATCH v9 05/55] Input: atmel_mxt_ts - output status from T48 Noise Supression Date: Wed, 25 Mar 2020 06:32:44 -0700 Message-ID: <20200325133334.19346-6-jiada_wang@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200325133334.19346-1-jiada_wang@mentor.com> References: <20200325133334.19346-1-jiada_wang@mentor.com> MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Nick Dyer This patch outputs status from T48 Noise Supression Signed-off-by: Nick Dyer Acked-by: Benson Leung Acked-by: Yufeng Shen (cherry picked from ndyer/linux/for-upstream commit 2895a6ff150a49f27a02938f8d262be238b296d8) Signed-off-by: George G. Davis Signed-off-by: Jiada Wang --- drivers/input/touchscreen/atmel_mxt_ts.c | 25 ++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 7e6a66e3e1e0..a53985a7736f 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -324,6 +324,7 @@ struct mxt_data { u16 T18_address; u8 T19_reportid; u16 T44_address; + u8 T48_reportid; u8 T100_reportid_min; u8 T100_reportid_max; @@ -978,6 +979,24 @@ static void mxt_proc_t100_message(struct mxt_data *data, u8 *message) data->update_input = true; } +static int mxt_proc_t48_messages(struct mxt_data *data, u8 *msg) +{ + struct device *dev = &data->client->dev; + u8 status, state; + + status = msg[1]; + state = msg[4]; + + dev_dbg(dev, "T48 state %d status %02X %s%s%s%s%s\n", state, status, + status & 0x01 ? "FREQCHG " : "", + status & 0x02 ? "APXCHG " : "", + status & 0x04 ? "ALGOERR " : "", + status & 0x10 ? "STATCHG " : "", + status & 0x20 ? "NLVLCHG " : ""); + + return 0; +} + static int mxt_proc_message(struct mxt_data *data, u8 *message) { u8 report_id = message[0]; @@ -987,6 +1006,8 @@ static int mxt_proc_message(struct mxt_data *data, u8 *message) if (report_id == data->T6_reportid) { mxt_proc_t6_messages(data, message); + } else if (report_id == data->T48_reportid) { + mxt_proc_t48_messages(data, message); } else if (!data->input_dev) { /* * Do not report events if input device @@ -1666,6 +1687,7 @@ static void mxt_free_object_table(struct mxt_data *data) data->T18_address = 0; data->T19_reportid = 0; data->T44_address = 0; + data->T48_reportid = 0; data->T100_reportid_min = 0; data->T100_reportid_max = 0; data->max_reportid = 0; @@ -1747,6 +1769,9 @@ static int mxt_parse_object_table(struct mxt_data *data, case MXT_SPT_GPIOPWM_T19: data->T19_reportid = min_id; break; + case MXT_PROCG_NOISESUPPRESSION_T48: + data->T48_reportid = min_id; + break; case MXT_TOUCH_MULTITOUCHSCREEN_T100: data->multitouch = MXT_TOUCH_MULTITOUCHSCREEN_T100; data->T100_reportid_min = min_id;