From patchwork Thu Mar 19 14:59:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 11447315 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3F48D1864 for ; Thu, 19 Mar 2020 15:00:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 273DD2072D for ; Thu, 19 Mar 2020 15:00:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727781AbgCSPAo (ORCPT ); Thu, 19 Mar 2020 11:00:44 -0400 Received: from esa2.mentor.iphmx.com ([68.232.141.98]:5218 "EHLO esa2.mentor.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727279AbgCSPAn (ORCPT ); Thu, 19 Mar 2020 11:00:43 -0400 IronPort-SDR: 8XGDnuUyuOCwZhIDb9bfcvKZFrLALdq+iFd3hT3XYk2GERyZHlEqRpdp4xBPag89psGCAOVaBy KGxlxBbjLhkZAZjU7KH1wRvBlqx1vsrh/HgOtoKvuU7mqBAhwpDMmDoLHxPzWMfgn2hi/eJqCk gLLRxLbO5QC5jUXue7cHnoKJ1uQkuGwlSR+c6JcuC86XOMdBImzu1LwudsHQ1sURojW1jEAkHs sWVz2VvtFL/fbQv301/5cm4u9kL46uyCEkpstwDUafCABMsSypYLDWm4nsXuVd6OXe+XremJU+ JlQ= X-IronPort-AV: E=Sophos;i="5.70,572,1574150400"; d="scan'208";a="46818554" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 19 Mar 2020 07:00:42 -0800 IronPort-SDR: mloZxVZhsFG+CYizjp1oXWDHunfMMbWUZ1XMdkgdPBb91xeEqZ94pF9++CpEQaNg73ZRXxqFLT ZgG8S47oJ11BsIHFdjijXDa8OjvQusJd6lXn5T737iocPSKBls0heNlcgn8Ap/V5dweTIF3PwP MkUaDAZJirEWI3CDCsWZ5J5HaZgzeBUwHZ3FjdgKnWlMg3Oy0HWI/M6hV49m/TaePJ/py+JyOs k9ojIOkGC/NCZylLuRGWwJMP5hR4Hv4Hy9i2aMX8an8s0XjE/wRsK0R2ITa0JNS2+MOvFqgDbv I+g= From: Jiada Wang To: , , , , , CC: , , , , Subject: [PATCH v8 05/52] Input: atmel_mxt_ts - output status from T48 Noise Supression Date: Thu, 19 Mar 2020 07:59:29 -0700 Message-ID: <20200319150016.61398-6-jiada_wang@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200319150016.61398-1-jiada_wang@mentor.com> References: <20200319150016.61398-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;