From patchwork Thu Jul 14 08:43:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Ellero X-Patchwork-Id: 591065 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02BDBC43334 for ; Thu, 14 Jul 2022 08:45:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231504AbiGNIpF (ORCPT ); Thu, 14 Jul 2022 04:45:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236884AbiGNIpE (ORCPT ); Thu, 14 Jul 2022 04:45:04 -0400 Received: from smtpdh19-2.aruba.it (smtpdh19-2.aruba.it [62.149.155.149]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 81752402CE for ; Thu, 14 Jul 2022 01:45:03 -0700 (PDT) Received: from asem-TANK-H61.asem.intra ([151.1.184.193]) by Aruba Outgoing Smtp with ESMTPSA id BuRhoA7r5bvrcBuS2oFpka; Thu, 14 Jul 2022 10:44:03 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1657788243; bh=82V/BwzKSn3pPk/IVOhT7YMBofgVkaQwuuRmgiOZ8AI=; h=From:To:Subject:Date:MIME-Version; b=fCgG3z87lo5hPrXnZqGmrXMcSMwVvR/zGqfkug8Rb5VPpn50/wx5WvhXJEdM2GyjV HdVtKuvPtx0g5utOsWPF6vkw7KooBIvrZ2d2z5xRrYyH23wwPLTLAXQCEay2zSg2Lr aZ0onVr7fSblVMpEH6TVWKbbeMjliaB3ZuvK0sp2Umv/YPcWqipuivtvx0LdNeSrZX /AOQm+CnHxZuuASbxDVfvVckAspYMqhq1aB3jUjUDXnwLcwl5vvExV0Do30Lpy/uCW pVMHIkroPOlarPqDK7zvAJYpJ1UXzGLs4cANlHs0R5h3EQEvcM/807GUUW+ZAEqlQy uMSajsQffzXng== From: Luca Ellero To: dmitry.torokhov@gmail.com, daniel@zonque.org, m.felsch@pengutronix.de, andriy.shevchenko@linux.intel.com, u.kleine-koenig@pengutronix.de, mkl@pengutronix.de, miquel.raynal@bootlin.com, imre.deak@nokia.com Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Ellero Subject: [PATCH 1/3] ads7846: don't report pressure for ads7845 Date: Thu, 14 Jul 2022 10:43:17 +0200 Message-Id: <20220714084319.107334-2-luca.ellero@brickedbrain.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220714084319.107334-1-luca.ellero@brickedbrain.com> References: <20220714084319.107334-1-luca.ellero@brickedbrain.com> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfP/NCL/d34WAYZfIx8PIc1a46cfqL0txdrtSAjzBLOqzYJz9dGtL7B6qA/P+bWEXxldcT2EybS7VBymHJAO/hPClUUKZlgQFyOghGUtzTY5FWgvRsNIo MP9xARjbbtIHXtJug3VSCdXWc3r7M/au4SpW9ACUNoo5RR25R8XQN7aAIuk2pzxBCcmwAzgYpDMPalqtDBLTbWuXvteyHcQxw/OsBxxxYkhnnxqeekOv7F5B Puz22GTennozlkfw6NTpwGw1Pq4Rx1lmQzhgIz95HIMb6VHkekvW/Vu1e9LAGodO5m2vImirxyrH8tu5c4Fcj0rlLVySkxFalSFacoI/zc3XoyDGkI61XEt+ sEVX8phtWtEyyXYObN95pRC66VaoKs0tjcOgpfE5ChgiQWKCY9R6BL50XKtDvknhTK/aa7UqnJTKEc4gYYLyqyPOBJ5ZwhPBS+54ZcsRgrMouRedqj89o3v4 eL0Dfp5SjDXiW3g7TrLV+WHBBFRqw81JtxmlyJVRmeVjPexLo4i/FUXBDHv7CuyAGhoowcdt8V1fh8D6bBRzCyJOUlnrVOyFacl346oiU4sJA7lUFagMdfW7 Izs= Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Luca Ellero ADS7845 doesn't support pressure. This patch avoids the following error reported by libinput-list-devices: "ADS7845 Touchscreen: kernel bug: device has min == max on ABS_PRESSURE" Signed-off-by: Luca Ellero --- drivers/input/touchscreen/ads7846.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index bed68a68f330..24605c40d039 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c @@ -1316,8 +1316,9 @@ static int ads7846_probe(struct spi_device *spi) pdata->y_min ? : 0, pdata->y_max ? : MAX_12BIT, 0, 0); - input_set_abs_params(input_dev, ABS_PRESSURE, - pdata->pressure_min, pdata->pressure_max, 0, 0); + if (ts->model != 7845) + input_set_abs_params(input_dev, ABS_PRESSURE, + pdata->pressure_min, pdata->pressure_max, 0, 0); /* * Parse common framework properties. Must be done here to ensure the From patchwork Thu Jul 14 08:43:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Ellero X-Patchwork-Id: 590575 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF708CCA47B for ; Thu, 14 Jul 2022 08:45:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234296AbiGNIpL (ORCPT ); Thu, 14 Jul 2022 04:45:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235898AbiGNIpJ (ORCPT ); Thu, 14 Jul 2022 04:45:09 -0400 Received: from smtpdh19-2.aruba.it (smtpdh19-2.aruba.it [62.149.155.149]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E72771EC73 for ; Thu, 14 Jul 2022 01:45:07 -0700 (PDT) Received: from asem-TANK-H61.asem.intra ([151.1.184.193]) by Aruba Outgoing Smtp with ESMTPSA id BuRhoA7r5bvrcBuS5oFplu; Thu, 14 Jul 2022 10:44:06 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1657788246; bh=uS+Azrz0pmFgc24xzV+6taJkOy63mYIx1D8fhtDMVmo=; h=From:To:Subject:Date:MIME-Version; b=HHm1qCikIi8vb0ly9c2XWNwJgNv/woqSpK5zOm3yac/TFEiwLvkaVm/NM11g9NGRv F3DdZYTbgY3D3sWd3nRghhkRhN4Y2/ec8zdQQJenMwmFISbvDIsNvlI6dRhHAnRrA0 KvHcb7UE1oR2D7KeVE0v7w1Z395azdWpjE1/iu4d0GoewiZbRoR6W2xDqiyWFGSOn0 9QPxG0YZxcYoz48ZKIQOVOhzmhAMWGS5IHAnpr8q9TxavTmDkyyPdXcMUN8cDoHJZ8 BzRC2r8FBQag0kpSp7kXUGhDvNA9v9pkZ+k67MbyD5176No5EERbEs8pLYCedLWfU1 HWzC4Jx8/uDKA== From: Luca Ellero To: dmitry.torokhov@gmail.com, daniel@zonque.org, m.felsch@pengutronix.de, andriy.shevchenko@linux.intel.com, u.kleine-koenig@pengutronix.de, mkl@pengutronix.de, miquel.raynal@bootlin.com, imre.deak@nokia.com Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Ellero Subject: [PATCH 2/3] ads7846: always set last command to PWRDOWN Date: Thu, 14 Jul 2022 10:43:18 +0200 Message-Id: <20220714084319.107334-3-luca.ellero@brickedbrain.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220714084319.107334-1-luca.ellero@brickedbrain.com> References: <20220714084319.107334-1-luca.ellero@brickedbrain.com> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfP6FcPNoB8W5uAx2KKKHpq5ZIb3HtAbo6IGTIQF5A9R0MaImPy6lI2snhxuAyB7yOQj3lyOdFxVMIkZpGHF9QiJLAGou8L7t5i+zV+/p5sqz8pwl6jhg e5JFbJO/Y03l8nQDNmvE3xRUUZ6C2zeIcp+xXZMtqzX0tl4qRJUL428in4U4dnOEZBwspGATn04jGj7oLxQd+jDQ1UH3Uw8Jm+aBoiXYaWp53s5WspI9KiC2 9lgFXx+QPTaK9rCoRIYouzC6espq8Gl7dSF6sWtPkah5s900J+exI40zXBiX7q6gFCtoY7aT3dTuZ18HjlV21oK+W8IlhhEzFALdCKWoc20P/W3NCaHGglCO /73nwOj1UD7wm4q7i42idWkGG6pCit5+vb2pDdwFegB3oyX8b+iaVCAM0sYmUFYMsqQVl9jEq8wT49n6MoHy+37qWglWGVNs20MhAaWCUlPkW08CEdmIMrJO FL8ZH3RNLdkipTU/uTE4hafpyx4iAM4Ud/MO6XJn5CBylvoeiuasOkv0vHMGv/DmN86GzhbNX2tWBQ2jI+FeeGL6iQ5RQ3gkB+8o1akmcOwy6jwNzSpM56bW aHE= Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Luca Ellero This was broken on controllers with 3 commands as ads7845. READ_Z1 was sent instead. Signed-off-by: Luca Ellero --- drivers/input/touchscreen/ads7846.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index 24605c40d039..9e15cdf6faa0 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c @@ -1066,6 +1066,9 @@ static int ads7846_setup_spi_msg(struct ads7846 *ts, struct ads7846_buf_layout *l = &packet->l[cmd_idx]; unsigned int max_count; + if (cmd_idx == packet->cmds - 1) + cmd_idx = ADS7846_PWDOWN; + if (ads7846_cmd_need_settle(cmd_idx)) max_count = packet->count + packet->count_skip; else @@ -1102,7 +1105,12 @@ static int ads7846_setup_spi_msg(struct ads7846 *ts, for (cmd_idx = 0; cmd_idx < packet->cmds; cmd_idx++) { struct ads7846_buf_layout *l = &packet->l[cmd_idx]; - u8 cmd = ads7846_get_cmd(cmd_idx, vref); + u8 cmd; + + if (cmd_idx == packet->cmds - 1) + cmd_idx = ADS7846_PWDOWN; + + cmd = ads7846_get_cmd(cmd_idx, vref); for (b = 0; b < l->count; b++) packet->tx[l->offset + b].cmd = cmd; From patchwork Thu Jul 14 08:43:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Ellero X-Patchwork-Id: 591064 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11840CCA47B for ; Thu, 14 Jul 2022 08:45:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237196AbiGNIpP (ORCPT ); Thu, 14 Jul 2022 04:45:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236864AbiGNIpL (ORCPT ); Thu, 14 Jul 2022 04:45:11 -0400 Received: from smtpdh19-2.aruba.it (smtpdh19-2.aruba.it [62.149.155.149]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 028252019B for ; Thu, 14 Jul 2022 01:45:09 -0700 (PDT) Received: from asem-TANK-H61.asem.intra ([151.1.184.193]) by Aruba Outgoing Smtp with ESMTPSA id BuRhoA7r5bvrcBuS8oFpnK; Thu, 14 Jul 2022 10:44:08 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1657788248; bh=d3ojLOveqXbmSiZO4Qo5C01LjgUH9rwc4A6+CEo+xVo=; h=From:To:Subject:Date:MIME-Version; b=BDA35mUCYAOivdxGzqV/T/0H+XWBYihh2F6mgussmoQJEmxINxaJS0IwGr9h66oXQ 4gKGq+wbeMUaMMDj7XpnX6C/GcHoutpDSvxEumct9bmw4ibNBUuY1MEMLWuN0LXlxS VebVTNqXk7t5e7RFzZ54hIRcsTDMqM4EcMm6+Jgh2LXvDW0MO99v5C41pUcUd7nZL4 9888QF/rU75d4nIR6Vph8K1kizcpvEzgG6dd9oGMI2JupN5XQqYY7qhllEp/y0d+mN ZxDNyuuwuo3Uwf1qaodT2FTiy6dKt/pF3xkEX2iu06+d5DVBELeTFWnZ7UmynKL9KK LJh6r9rW8TsSA== From: Luca Ellero To: dmitry.torokhov@gmail.com, daniel@zonque.org, m.felsch@pengutronix.de, andriy.shevchenko@linux.intel.com, u.kleine-koenig@pengutronix.de, mkl@pengutronix.de, miquel.raynal@bootlin.com, imre.deak@nokia.com Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Ellero Subject: [PATCH 3/3] ads7846: don't check penirq immediately for 7845 Date: Thu, 14 Jul 2022 10:43:19 +0200 Message-Id: <20220714084319.107334-4-luca.ellero@brickedbrain.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220714084319.107334-1-luca.ellero@brickedbrain.com> References: <20220714084319.107334-1-luca.ellero@brickedbrain.com> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfJzV9VCatr6RG2B2PnZzh7ZVU62HDO+BSCRsFLg8V8lw84wpBMsJR6K5ZcTIa797byu74rOs/wRk/H7d82GMTODnvJRcbbPJrttHVhgfmtXH/n0wzWo3 hoWVK3gLd753yUrHpdQXgc8dp1zXhwIo8QsbCfQNsAvXNDj3WNEWPKrHgGyxDzLHDiM5lDNWeI4WHqx+FNVLwN1gVfJpcu/Ua1zGZfyOOErB0yOpJhlXkkHS lOiYZH+4GECM2KU5RGjji+qfwcWgkS6EyuYpQhPhCb1+GDe82It0nTL5pwov5rC3BUle4tJZ05C207UTju+1Y+cKLMAa19xuosY6TLKXQXvzqEv4zKCFw6Ux yk222vF3z2Woh51lUXFjH3s5B1wya4kRJVK9y/jzJ6f0m6RIRIp75tVYeE9XMS+fQ3ohbGp/mGiQ/qDwPOrXkYbUR4ITvJtCDdN0WoLj4ZYyn91xRjz+q5yb eBSLENMVmFLJ0S9zivlWSKvKLVmynOgAGQgn1TUMbFrCV3k/0riYjr9RyL3IUydVJ1IbtrlIUdXZgf/M3dgq6p9HmtxtvykGqr/X2WoxU4lNJzoqGx7X3+Tg fKE= Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Luca Ellero To discard false readings, one should use "ti,penirq-recheck-delay-usecs". Checking get_pendown_state() at the beginning, most of the time fails causing malfunctioning. Signed-off-by: Luca Ellero --- drivers/input/touchscreen/ads7846.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index 9e15cdf6faa0..122d3a13b7c5 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c @@ -843,14 +843,8 @@ static void ads7846_report_state(struct ads7846 *ts) if (x == MAX_12BIT) x = 0; - if (ts->model == 7843) { + if (ts->model == 7843 || ts->model == 7845) { Rt = ts->pressure_max / 2; - } else if (ts->model == 7845) { - if (get_pendown_state(ts)) - Rt = ts->pressure_max / 2; - else - Rt = 0; - dev_vdbg(&ts->spi->dev, "x/y: %d/%d, PD %d\n", x, y, Rt); } else if (likely(x && z1)) { /* compute touch pressure resistance using equation #2 */ Rt = z2;