From patchwork Thu Jul 21 08:34:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Ellero X-Patchwork-Id: 592264 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 18C03CCA479 for ; Thu, 21 Jul 2022 08:36:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231877AbiGUIgT (ORCPT ); Thu, 21 Jul 2022 04:36:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231499AbiGUIgR (ORCPT ); Thu, 21 Jul 2022 04:36:17 -0400 Received: from smtpcmd02101.aruba.it (smtpcmd02101.aruba.it [62.149.158.101]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 3720A22BE4 for ; Thu, 21 Jul 2022 01:36:15 -0700 (PDT) Received: from asem-TANK-H61.asem.intra ([151.1.184.193]) by Aruba Outgoing Smtp with ESMTPSA id ERe9oJVIEtk1HEReJojXoF; Thu, 21 Jul 2022 10:35:14 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1658392514; bh=tkpOYpCcZE1Bre0jpfaelBhmDtGIU38n7jAmgeM3WnE=; h=From:To:Subject:Date:MIME-Version; b=Sy+c07Zc0k3k3x0s26gPqkwImTlH9c7j1i23dYDy9pC5DNohk1MF4tbCZJH8ayd8n 6drRXXpgojntGk/ttyM+ZNuHv4TCwpJe70ALThC/6BI3oOXuOPgluUbQPcoAp8dko+ NNu43Vzvb4APSDgwAIGYQDoM3UGhV0XV44ptw/vmQpFK0wH3F+/Mz4LRm+R2KrSXGR YF2SoApn0T2JEnIfa3XXP+jdafOruzdi8UDmyRE7vhf68SS8wBU0xe1OvvlHKSSPkl tbdkeHUQVPKBqKi+0IxgzUVeJ4jyj5hBiJbrm7SN10CVsvete9JsfwXiDQ3fRwRRU5 EW68Cq/Le/+2A== 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 v2 1/3] ads7846: don't report pressure for ads7845 Date: Thu, 21 Jul 2022 10:34:56 +0200 Message-Id: <20220721083458.6412-2-luca.ellero@brickedbrain.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220721083458.6412-1-luca.ellero@brickedbrain.com> References: <20220721083458.6412-1-luca.ellero@brickedbrain.com> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfO4plaYvd/DeQ97oMCVVt7FnIQg3nX7wTUDtAN49Y/Ac6fAjVU1BKV5UqYwa6hnQ/qiYBwYlGVUGU+dYdb6JN81WrbAeITsZuP61hdPIQTLsFm//pgIU bngsg0Kq1dnm6r7V9vNYMBlzbIn4MUOHBcifkRCe1Aw7S0QzMtUmg1Yj1OV9boY09T7A/FtzdMxOKmSIU432IJfmISb1QNMaWShNJHwlTFztuhoHIwFK60/R MsxuGXhpDy67/sl/28K5jW+SFtIrUPBO/ChuCLLp/RqmJnVguOEDdICX2F1LhUp2LrIOJyELDW2JHrPB88yH7ktUWgyPUt2EiLg1np9AjUDWsuSeswtAUmHL ZJaKc6OhcHC41FmUU9IA25fKwW5CnSJEVQm5jAwxp7D3lnLk9g6YW57w0+0g5McyNwaHi5PPZh+IVwFoEv10XPFdBpdRl/ot3lq5gsdjFX/xc4fx6D/krl9U nhNdFVenX5o6EOd0uTOmSEyqh+6T3zvNYgcMF7KrtTrgZv99jP0GV6YQkH4BSBv9g9bVCTR6aqHtGv2AT1cxKhCuuBIvdsfL2x//uBn9SRIFngK3ovTadvo0 uS8= 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 --- Changes for v2: - add missing period in commit message 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 21 08:34: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: 592668 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 57FDBCCA485 for ; Thu, 21 Jul 2022 08:36:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232094AbiGUIgU (ORCPT ); Thu, 21 Jul 2022 04:36:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232023AbiGUIgT (ORCPT ); Thu, 21 Jul 2022 04:36:19 -0400 Received: from smtpcmd02101.aruba.it (smtpcmd02101.aruba.it [62.149.158.101]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id CBF4A2D1CB for ; Thu, 21 Jul 2022 01:36:17 -0700 (PDT) Received: from asem-TANK-H61.asem.intra ([151.1.184.193]) by Aruba Outgoing Smtp with ESMTPSA id ERe9oJVIEtk1HEReNojXui; Thu, 21 Jul 2022 10:35:17 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1658392517; bh=oXXlmEclM46t4RqiuezLEhwkrU0aTDxl/RW2gMphcr8=; h=From:To:Subject:Date:MIME-Version; b=AvkcOWOWDD2SZ70cqTpzw4J1vkOtzHSY69J7jMG/ZcCtHU2Qa5gi7EiUO8v1ms+I4 UUGLcIshsjCapYYeTtNLyG4ZMR1mr87gETYlDc7ziEgyTai1tB/1GWkcdapa/itslb j9SDnh+6KJiJM2s+Sgj7UWRwWfqFV8JeAIjlFXrZ/Wtlh1OwfVbDvlf+cyvQafRWBb Y07hWyhqSzX1HkqAb6rtXOehk7UkUKwJihOrQZFL2xsaPNRVVjELl1qssuTrwXBuv2 FbypfNIlaxPI+MzxTXuPem/GY9Dl7DtJTtPj7gapSdU6PO4gR/ndyjzR7+SHpgnPdi mndMVkWWlKivw== 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 v2 2/3] ads7846: always set last command to PWRDOWN Date: Thu, 21 Jul 2022 10:34:57 +0200 Message-Id: <20220721083458.6412-3-luca.ellero@brickedbrain.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220721083458.6412-1-luca.ellero@brickedbrain.com> References: <20220721083458.6412-1-luca.ellero@brickedbrain.com> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfIl+SynEE+I3wFjmDDjGBOacdtbrBOC5L4m2I/bpYsYtF9lh7yNqSkKqgiT+h+fFwu3S74nT8eGzQ7LX9QsGBkPoDyZzxFS9sTxdDxEmtwm88Ea1mlJm c1LMcRVYwJ7jgDUZ1p99qeBp2N8lMjlqxhuHbHF/DnRON+uSB5S37gT4Qja/FFeBXT2pUowVYS+wjDaK9CGMNQOkV25bbk0VxyTjmaNEwP2xWkCyvZXbbkMu m3s4FxZ9D3oxUNv0RFOoeVWr5BEBUJuxR+gTnM3hcyHjdV0JiwLx/J/3BRYETR/Ldidz4VZijhDw98pZzWu/cg6wnFPDkByWXkKTf4to65RZsR6hfzk2EBGD AH8zPrF5Qz4yG0TqhB8mTqaHxLjljjQ5/WScTTOBFH1loxJ7IhZGD+n+CWorMRXU2rzyZsksIvNs/YblQKWDEeBghoX9F7rpkJg49OI2m9Cv2dIqebb7wRm1 NlUMorI3yS8ghEt8W+o9ja16VOEu0hNmi1WiNYfRTNDjO/P1vvmkSLuQR6GW7F8Fe/q9Km39pFjjYr/SrZf8bL3QFYFSV63Sko/m6q+SFieXu2a7AV1vRetn 124= Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Luca Ellero 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 --- Changes for v2: - elaborate commit message 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 21 08:34: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: 592263 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 D7AD4C43334 for ; Thu, 21 Jul 2022 08:36:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231239AbiGUIgd (ORCPT ); Thu, 21 Jul 2022 04:36:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232350AbiGUIg2 (ORCPT ); Thu, 21 Jul 2022 04:36:28 -0400 Received: from smtpcmd02101.aruba.it (smtpcmd02101.aruba.it [62.149.158.101]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 9F14737FA5 for ; Thu, 21 Jul 2022 01:36:23 -0700 (PDT) Received: from asem-TANK-H61.asem.intra ([151.1.184.193]) by Aruba Outgoing Smtp with ESMTPSA id ERe9oJVIEtk1HEReRojXy2; Thu, 21 Jul 2022 10:35:21 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1658392522; bh=d3ojLOveqXbmSiZO4Qo5C01LjgUH9rwc4A6+CEo+xVo=; h=From:To:Subject:Date:MIME-Version; b=FQ/8T24nFLJ7wl2q868J8AckjLWYO0PHwwRxM++IGFwqfsZVNkNfbePCH+lX1MwBG urnxGBw6BkH2aYwh5Dp7e0Nq/YgNvB9CcbfN0VbaDDkVXg3dNJC9uLh+YFgp8vgKqc bRsjdLm6AD0Xuh1yacCaMG852k/hA0ilqEYFQZ8W2uLAqYLqVwm5nOjnRUtVRYOg4R i2Cpf8k7gnhQz28VsJdUTl+8pR3DaTEfZ4GSO9U7OdRX73FODY9P+10j6uEgApxsuP 0A2v8BnrFL4T7KZaEIRLiseq3Cfw1qrR95Cip3GCQHAdqiEQ1l7pSAUKdEqpSCz3Kr pEQQ9w+nWwOVQ== 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 v2 3/3] ads7846: don't check penirq immediately for 7845 Date: Thu, 21 Jul 2022 10:34:58 +0200 Message-Id: <20220721083458.6412-4-luca.ellero@brickedbrain.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220721083458.6412-1-luca.ellero@brickedbrain.com> References: <20220721083458.6412-1-luca.ellero@brickedbrain.com> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfFbdTgu8oX/OZAFfyhgjeweFgExsOWhbkk4p92LNQsdkO1lpmrlOwkJxIz3lfVBUyr7aPxpcaWaAkJ7ExQ0POBk0gtz+oEhGquM92q/1R0/8WWmUQRPU 7GrCa7XoLa0RaWyuUxfueDzLeracnhE+LwqBcc9ddzbVRalbVP706cBymI2tizvoGpNB84P5IdRMPf+q0ddZ0ZVweKt2BBRBVcHKLOGnJjZH0pInqdabL+TP oLr4DcUtirIOJNoOBMCC1IqK8S5Qer850cbxEqZoBKfPMrEtgYe1ZXqrUyg8RBG5e6M1lkrf3MTxXhUd4mOnT9/bO/i0ncrI4unNa2k47Tri4XrxVNP2jHgP 3ZAJ61TjDMCx+vos8s7g75OiWXJsCZ/rlNJ+my/GkhbGxQQVy3cpLkMxnTZbz/igMbsUammXXcQTFGuvsViD8G2TGw805uydgGwlhm9oIj+dynNc/RXbvk6i TGzwyrpdlYxjgyJGQUPwtYcyqFb5fa7iUBrLbFBql/c0hpLm+3Omv2Jl9KFxCkDjjzMSdDCc68yfXnH2Cw9QnfyURXJEnkDH/IAVZgtKwB4iQKFCAKOAbk// aXA= 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;