From patchwork Tue Nov 29 15:19:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Ellero X-Patchwork-Id: 629310 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 9E620C433FE for ; Tue, 29 Nov 2022 15:38:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235256AbiK2PiX (ORCPT ); Tue, 29 Nov 2022 10:38:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235819AbiK2PiS (ORCPT ); Tue, 29 Nov 2022 10:38:18 -0500 Received: from smtpcmd04131.aruba.it (smtpcmd04131.aruba.it [62.149.158.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 079B04A5AB for ; Tue, 29 Nov 2022 07:38:16 -0800 (PST) Received: from asem-TANK-H61.asem.intra ([151.1.184.193]) by Aruba Outgoing Smtp with ESMTPSA id 02Ozp6txJm9gv02P6pWxJh; Tue, 29 Nov 2022 16:20:12 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1669735212; bh=YjSUEgk5xEtRyb/aGmtR6rCr+sWhkB+LZFctxSrk8Ac=; h=From:To:Subject:Date:MIME-Version; b=ALCJuihXEIXFpUvHqWv0t664QYmXoTAjlWCYztlPCr2dUoUa5RvPhQseZnY1s915g NAg44YZJrQ+OSDYNt4oAQA9l1Ufg4EuDpD/5pSQiUzRCnBkpQm4MNp/OpN+nhXgrRq zroc7d5cfAyVsLPMtlSTT5oGQdZGFc+CbJL4fjaQ/pLMaO5m5RoAVl3QKV2Pc+GjVj Z9CYX5QWeYRbl7MMC92+2+q6Ua2pDFmMq4uBzMtFbySYUcGCdTcL+XE9C2hXCi4fDu E8xDPfeQGtOtqKni3Z8h/GWHi9r+lpSMPHa85gZ4pI6c913PZ4sFoCR5PQAn5ZoTnZ 7qDoi7FaQvEAQ== 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, luca.ellero@brickedbrain.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: Tue, 29 Nov 2022 16:19:57 +0100 Message-Id: <20221129151959.26052-2-l.ellero@asem.it> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221129151959.26052-1-l.ellero@asem.it> References: <20221129151959.26052-1-l.ellero@asem.it> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfGGj2nnXxhNYvUcpYUGFwPztJwinMw1IcautUPLIYXc6uTdeTIh1MUMWJ6F1OulX/Art8NqSRdZG8bUaRuIbDeWxRxxUztUDWZPN4Q7ithsNY8kkHpLu q8U5WJ9ny0TbP4tpu33sjMlX5NVPDbcrHaiRENTIdJt7vIaNbdgFsS6o4QgUK4EJsaffWVmOF7YDf+ILgZEbqG4j+FqJTCV83PkJGN3laJCNVmZvBUuyEG23 3vMw/PtHRWZofI4lf7ZtGAuueSATvkUnyQ7Y+JW+DmJlhWYuEfYszWGDL9RCtieHLzodl1sUQbikTPCFvJPQeP5oYkPrVoJd2UfTAYsoCkSL621uJPEb0Bow oHlw1gNopcHeMRTdBr1R2qOxVjK9qXVdUFs432oVZlLFnUMRF5uFf24VpXltHHywfmzr7EsLcPTgZmClPR/py/ODZB/pimo2HokhiMYbBYswKgGmI0u9ZgWv ufLdGNOS347ajSEvD7gaygU+7kZiEI1Sx3hqjWREPTSxeY7rhw7d9KaQHfedGJ859BDROqe8Az/V+dlFcKhWaZ/OMcYJG56Ah2geMMhfdr4PsLX4NcCW4s2A 4o5Cqx7SrAaZ6M0icKnGGMKQ Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org 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 Tue Nov 29 15:19:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Ellero X-Patchwork-Id: 629745 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 651B2C4167B for ; Tue, 29 Nov 2022 15:38:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230353AbiK2PiZ (ORCPT ); Tue, 29 Nov 2022 10:38:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230151AbiK2PiY (ORCPT ); Tue, 29 Nov 2022 10:38:24 -0500 Received: from smtpcmd04131.aruba.it (smtpcmd04131.aruba.it [62.149.158.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 51420FD16 for ; Tue, 29 Nov 2022 07:38:23 -0800 (PST) Received: from asem-TANK-H61.asem.intra ([151.1.184.193]) by Aruba Outgoing Smtp with ESMTPSA id 02Ozp6txJm9gv02PApWxO5; Tue, 29 Nov 2022 16:20:18 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1669735218; bh=zTsu9YvjjwpwF7zSkRalIemgq9HBKFWhACD/LncT3zM=; h=From:To:Subject:Date:MIME-Version; b=EvoQWEPn6+aJ7OysISOue95GBqEH3etE/fPxXolkiY7Kmhwk++Wb9DGdIh+5Y4Wgn n4iEN4TXMtpeeFnvNL0nG3N0y5XlPpqinowcRLrbFwdCfqy5ctEGh5vBrVeFzdiuww u981UjGzk9dv5FbIz7OtNxKsnuWN/Rmth41Dz4k2/0LzNq8TvDddhbldxsrcNmaes0 TA145W2IKxaPzYBxkLvrsv3N+u1Ny4kuOT/e/Bcggx5ktbw/poTudnjdAfvGbxmHqM PSEFZvhFZZ1L0YjHBeD9XstF/Cg0bL3ir3tJcKbR+0juZ8x2oAcMYxo0dodDbJmK9c 8cDWRrTxrawqA== 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, luca.ellero@brickedbrain.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: Tue, 29 Nov 2022 16:19:58 +0100 Message-Id: <20221129151959.26052-3-l.ellero@asem.it> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221129151959.26052-1-l.ellero@asem.it> References: <20221129151959.26052-1-l.ellero@asem.it> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfAmA3u28NvvV4JGz2hpRmeIayrM1Psfe+/ROG4Pc5pcbewBBCWDiNDpCFeyPYwVYM80csFMbbKUZ3XJG/cmlxqQkfGE1tCpBO72NEMQqgs409Sl0IJe8 WdKCYuFi7Cimg+x3BdKcXcV57LD0oMM5q4CQouGNwIvsBVD8U7pY6kzndCdQuTEHsGXt4byoe/LB41mNrwUGz35RgPTMb4H3WVlrJSetuS8u+E2jo0sZarZi c4KXesBtVAZWTH8TnHo1O+1ehgUpsXrNfrY0NKAWM1P6A1CCvDPKopS44bm3YdR8+GRCZqm6ASQ0KYaBfA6+2YJuQvmdwmtYN3VeRtOXI5IgOs1ibDFLwqnV +UuVkpmAAcIPV2TuP9yrRMo0BDQHhzMkS+79M14fUTWyA4GLqghnwdPmwf34RPItmIpdRozEyOe3U/1ZJAPGS0Xn+li5vLQLvOtUqpygp+as2j6fT3S4yETr T88OxdfG2xFhM8bvtwGJaJw/EBYltnV4Pwv3yTPdA9NvJz2J8SfCpaLO5F81NbXM9EV73+QLxzuv0Nv74bWfyh0a6Yeq8oX24ZlYMQ4mqUf693lvS5TyYFc0 GIHuMUBsrUj+csjCHeqNyeur Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Controllers that report pressure (e.g. ADS7846) use 5 commands and the correct sequence is READ_X, READ_Y, READ_Z1, READ_Z2, PWRDOWN. Controllers that don't report pressure (e.g. ADS7845/ADS7843) use only 3 commands and the correct sequence should be READ_X, READ_Y, PWRDOWN. But the sequence sent was incorrect: READ_X, READ_Y, READ_Z1. This patch fixes it. 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 Tue Nov 29 15:19:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Ellero X-Patchwork-Id: 629311 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 00053C4167B for ; Tue, 29 Nov 2022 15:30:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235837AbiK2Pai (ORCPT ); Tue, 29 Nov 2022 10:30:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235754AbiK2Pag (ORCPT ); Tue, 29 Nov 2022 10:30:36 -0500 X-Greylist: delayed 622 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Tue, 29 Nov 2022 07:30:32 PST Received: from smtpcmd04131.aruba.it (smtpcmd04131.aruba.it [62.149.158.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 7A7AD60EAE for ; Tue, 29 Nov 2022 07:30:32 -0800 (PST) Received: from asem-TANK-H61.asem.intra ([151.1.184.193]) by Aruba Outgoing Smtp with ESMTPSA id 02Ozp6txJm9gv02PLpWxUk; Tue, 29 Nov 2022 16:20:28 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1669735228; bh=loRkK3v18v6DijDl9IFXyx+yOfz6h4JPvTbCHffpCLU=; h=From:To:Subject:Date:MIME-Version; b=NVog6tFKruhE4LHx4UXgTbTlJRMCJ09Mesd28Y1WSlXkGshLggIOoDcdrvOt684/f SpEDYj8adL30DmT/9Hv3vWIp8wY9cnyrKReW07yj8bkCJtRiCct7+vxoJ9P8wgQ9sJ WEx6bpst52PkcMuhzCyMvx8ovPwfKVA32Z0cgvk7rAoGTyy2lsay0gBimtbPKDyLLO ok8Im3Gfi7dfTCCprKTqdqyhLQoH23wT8tFiXx2HpEZeD4a2v56bvcn3Te34J/jAzv KbbpKjRLhG9gjcol8/9I/Upg1Q97eX+KbVII7X4P8+yCBf8SSa3Z3UDGtS4/kPYs4b 8JiTlx7Du4OzQ== 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, luca.ellero@brickedbrain.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: Tue, 29 Nov 2022 16:19:59 +0100 Message-Id: <20221129151959.26052-4-l.ellero@asem.it> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221129151959.26052-1-l.ellero@asem.it> References: <20221129151959.26052-1-l.ellero@asem.it> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfPYgu1vwqK7707YHL9+lchuSqtqnDkS9kvjahqpsSp7Xa4s3YkRoB80VbCh+Hclx9Lqq/tvTOYfd+z/N1RpqouOgqeBV41BZDtVBFrVjW2rqD25cL63O +NT1tz+G+LHT1wA3I+hRqswcuHn3xNi+AoEwPxvhM47C/ggi6NcOidSvPiOuaASNEvyqNnV5hBvTEJmck1ho1TT7T7bP5veh4bB7fhagCqfQ/91R7zFG9Pt6 P210cEjQHfXqV5OEQJ3LUXEuIsn5Kchh3oYW/ZuymzC0odv0bhCGRM7+3iqrUpAxkgvgfaBaTVt2kcWMbcVIc0A4niOE0cdGgGLnpZ3++qw+Hfmzoi9Rv2YX MU1atxttLF27kcvkckMLmLWxnAYx2buzNrxYp5hRcXqxD7aobfMxlnXT6+ero3uqN4Qggy2iUpaDZIz6xP8/yZvW70oJoGmVBClPZiAoX6s0U/mHnUN41XEZ fjdTuPxpaI8c1idaT2EVrNWqTtras8dxd3Miym5RLYX4o/inLr7G7275/YUC7vXL5M/Bl9t6kKR7vXa8P60o/pbdMQwAl+1YRWsRMFPZL1WJPihQRWUTXnz/ 2ZQ9ZL/j0LgA0No50m1NF2F/ Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org 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;