From patchwork Fri Aug 12 08:42:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Ellero X-Patchwork-Id: 597399 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 66269C00140 for ; Fri, 12 Aug 2022 08:44:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237469AbiHLIo1 (ORCPT ); Fri, 12 Aug 2022 04:44:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237510AbiHLIoZ (ORCPT ); Fri, 12 Aug 2022 04:44:25 -0400 Received: from smtpcmd01-sp1.aruba.it (smtpcmd01-sp1.aruba.it [62.149.158.218]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 54C0DA8CD4 for ; Fri, 12 Aug 2022 01:44:21 -0700 (PDT) Received: from asem-TANK-H61.asem.intra ([151.1.184.193]) by Aruba Outgoing Smtp with ESMTPSA id MQG1oHcRkr8wyMQGGoLauk; Fri, 12 Aug 2022 10:43:20 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1660293800; bh=YjSUEgk5xEtRyb/aGmtR6rCr+sWhkB+LZFctxSrk8Ac=; h=From:To:Subject:Date:MIME-Version; b=RxuSRabKkiTUOxO2ncgwKIfGd3ed1an+KeiruNAFUFZNOSLABeQBIvw8ta1Hu0idI krEBuvFj9U3eQtky9XP/9/50xGzULXdgKRVfBKk/IgczGSxLbHP3fsu2K6aEpwoXK+ w89SyWBtoHoCdxFZCycnNkzgHOB8pMicyEzzmPBj0ZD9T+oKUxkWJoehOtNWaBxx+5 AjfuwNz0gJ5WXFOGfthHEW+YWsgJKFzgYbjBF6Y+6427QaSfKyxXrom+gtPotpPEuD 3BGGe2Yhhfzu/Ih6MTQ+5dVzp5wRVCVQ2cO4C7WTdSgP/5QxvaQvpIAnkNgXaItDD/ FFTsSRSnQIC/g== 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 v3 1/3] ads7846: don't report pressure for ads7845 Date: Fri, 12 Aug 2022 10:42:46 +0200 Message-Id: <20220812084248.9270-2-l.ellero@asem.it> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220812084248.9270-1-l.ellero@asem.it> References: <20220812084248.9270-1-l.ellero@asem.it> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfKG+tgyKyB8OBZxtKfdoQtSOIr923ZxeRcKCQ4iKVV4+RHzAT5X2PoIkKMuSsMGgJtmfD6PSiK9mYLXMSNG6ZigDf8N0jcfS2zUQ74mtMyCSRed1rgnS iQwlmQ0DKqlZArOrYa5VTwUI9xWF2DPpSA9EaMNB5L+vr30sUu9obm+xkNqNITToYaBz0NrIwZ6wXwTST/fDl9hhBcdsPIL4Ru0mxeOWCrkJF6U+g1hl2P/+ CTrrbta3UDvQguGzz4gESCmkvuU+Vl3gAAFER9/uxqdEZQJ9505egwXRvahBqunIVtLnZNrAedLdxSMNpM/X8KyLKmYc+eUrvE2ieuart5tNgQt+0Doq47Rx 2BKiA2s8N21+pO7Hvnr6AyxfH/4kUg22yRpUTnWM6hWA6MTo4NinY10YFS8tm2263aQ6Tv5lzFex46IarcbLYLEW9zoaKiW1dvNpcRn8RyA3F82RdKa4bphy PsXGSD8rFD7y1JfaQnaAcrmMUboexsfeSdMZNTIZMMVkswu3wvrIxDFsSvKEtT/0X4/ZGm2ttcErVffhBNVukpzyGFIUdFn0J/WX/EwmPkv4aXfmtkSPjecy 4GbYb9OoewDJdDUFeoVskeQi 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 Fri Aug 12 08:42:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Ellero X-Patchwork-Id: 596961 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 78F4FC00140 for ; Fri, 12 Aug 2022 08:44:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237563AbiHLIof (ORCPT ); Fri, 12 Aug 2022 04:44:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237523AbiHLIob (ORCPT ); Fri, 12 Aug 2022 04:44:31 -0400 Received: from smtpcmd01-sp1.aruba.it (smtpcmd01-sp1.aruba.it [62.149.158.218]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 7F3EDA8CD9 for ; Fri, 12 Aug 2022 01:44:28 -0700 (PDT) Received: from asem-TANK-H61.asem.intra ([151.1.184.193]) by Aruba Outgoing Smtp with ESMTPSA id MQG1oHcRkr8wyMQGNoLawX; Fri, 12 Aug 2022 10:43:27 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1660293807; bh=zTsu9YvjjwpwF7zSkRalIemgq9HBKFWhACD/LncT3zM=; h=From:To:Subject:Date:MIME-Version; b=CGndxdDczVlyGFXDgQaNxvhP9AD1SU3PD6jvWOEXIgyaURr9g5gljDBjv33MYJL04 diIex1ISS7ZZdZM1v4BnwvCn0N45muG4XlD8DBDIvHQyM3B2t1We8hYMFct89Qje7V 27ELT4Yr856mX0j8h4Dx47zc5Ge5daYmk8Qj9ctpcR762wgzsOcHY1aMZ1SFmJnChJ 4iqfDvH3UNjKARhj7ZxfqHxhbQrXTTNIAFhJ22OP9mcsvXSddDShlLwmr7o9e3Jq4o tNKfLxVCEkHa3GHEuJJnXlq83syGoIgjVtTrLOuyhIfy8EoX7zkoqmY80ddmtJg9LP 5J6oPeIcyp1IQ== 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 v3 2/3] ads7846: always set last command to PWRDOWN Date: Fri, 12 Aug 2022 10:42:47 +0200 Message-Id: <20220812084248.9270-3-l.ellero@asem.it> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220812084248.9270-1-l.ellero@asem.it> References: <20220812084248.9270-1-l.ellero@asem.it> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfIjPLdLp0rMab/osJp5kJNC0XwiH54YatJ+DoN1ji7KN2sRRTjVi9ClcIM7g6gLaDzeKkRJ0i9e+H1aabXAkgCxOTYe2Y7MW44Mg071wRAs2DpMB3VaA FL2HIsgYeODftPLVK9XV6pNvJq1P+oVEZW3Cv5W4xs/N53t5R3hKxj8wcyhWI7TRjH6SGHm4vLHppNF+AaBEBBAvH3V5voty6cF+iJAzu23uuPvMfO6tmaH1 0gaaYgOwbEjhdA6y8S/qQ7VwEmIWWQP88CvdOdVg0GgNa5TYWBmwYnAg2olnmT5sJakrW2BzKFIsR0isrAANWpj8icg4rr8cKeessp1oNNr+a5gtUkBWML3h udkLF1Tuw7KIZmZdOfIknIHFIL+FZ1qdrc7qHw0wnDwRqApPrjbAp885QA1EhK6zfcUdxqx2+YPYgbuEubtBpHuHGLkx1fhfaue1UN7a23JRgJChL9MWw0X4 uH7+E0jcOyL+ngwH/LD4xTXm/pBlTiGlzHuOkU4K++OhBxwiLeqNd0ZqSC9tsvq9yCozHNDjr49cOBq4TjV+yt5ANNYBJPZ9JOO0MyU9ilEs1qxmNjUYdXo+ //X7MIfwFm42TuM+Q7ubleg3 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 Fri Aug 12 08:42:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Ellero X-Patchwork-Id: 597398 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 CDC5BC00140 for ; Fri, 12 Aug 2022 08:44:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237537AbiHLIoq (ORCPT ); Fri, 12 Aug 2022 04:44:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237517AbiHLIoj (ORCPT ); Fri, 12 Aug 2022 04:44:39 -0400 Received: from smtpcmd01-sp1.aruba.it (smtpcmd01-sp1.aruba.it [62.149.158.218]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 55E1AA8CE0 for ; Fri, 12 Aug 2022 01:44:37 -0700 (PDT) Received: from asem-TANK-H61.asem.intra ([151.1.184.193]) by Aruba Outgoing Smtp with ESMTPSA id MQG1oHcRkr8wyMQGWoLazj; Fri, 12 Aug 2022 10:43:37 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1660293817; bh=loRkK3v18v6DijDl9IFXyx+yOfz6h4JPvTbCHffpCLU=; h=From:To:Subject:Date:MIME-Version; b=WobmAw1fnOg+SbDE2bUSQsNKxPNI0zaosINEtS+grYIYQ+KllVsaLLEgImngMMoQB xv9uytHWq9C4ZYoiJ77tcs63++sFODYhPDeuo4BCIMUEfDvk6krPhxxLnuH40PYjh0 JcHdEQyVfHHxqvJgQlnnKQot7nruzQ0bYd4K+0K1UO/wN3qlQMBX1Bqwg3C6qe1xjL yTJY3034HU2Fd5yC1HPul9UBfaaK/TZqgIFSEcDBrCJauamSBNluFakZ5ixTme6eXw hZ9UN7ZKQ16cu1FYmHkjpFqPqEfgrNSJW03WFbgg+A33OEIo5X5y7W/Y2siJcnpBWm Bq9Tt1xeb0JiQ== 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 v3 3/3] ads7846: don't check penirq immediately for 7845 Date: Fri, 12 Aug 2022 10:42:48 +0200 Message-Id: <20220812084248.9270-4-l.ellero@asem.it> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220812084248.9270-1-l.ellero@asem.it> References: <20220812084248.9270-1-l.ellero@asem.it> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfC7WR5gbThm59nUe8T/2yuvMo1KDOesTazhyZc+l4NYiOYv4WvQMXO2I05kZkcmK4PxZ0DErVpqXlaTvPfz4koRr4GLpFNsWLfCarFv1W/06+4axpHn+ q690VV1ZacV1nITpZMtm8R+0AMA67/F7JChWrdEJx5BSThcDzMDqSGVMefJamy3tn8D85eryqgOBf6GEsRu+HDl2y2qcVNti8fuzVR1opJijTE2mesaNgmAP TU74i69wYe0TtFn7zrV4SLTRJi2SWhiXuU7dfL4/UTEbI4dcBpKB3X/8Nst+6jCM03d9axP9g1elObodC3TF10mT4P+GOR/Fmcik8tbNHg/hoIRNohBQ6Oen +4mUb7sjBGtLxXOiHj1UNN+ndNjNt/rjG3+FNCJWsL5rVObNjxpc7cJTt6fAHUjpshxVxSvIlJMJ2OdBSXzW5RhepewVoWb6ND4YDKEUwqpjUoWuTsEk4qeG yKznpqgkhBCpW7Nlzb2G1CsuNJ1C6P07jFpgtHwxrCXQu9RCErl5GY8WIGn7CX67gdpv9u6wFtjBqZsYV0+b/nbXVWa0aoMDCvEpo8r2pI/DwrlM5+0owZ+J FJjQFbB0zso1SwCjkuOXgrtg 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;