From patchwork Thu Jan 26 10:52:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Ellero X-Patchwork-Id: 647807 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 A0DBBC05027 for ; Thu, 26 Jan 2023 11:11:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237182AbjAZLLy (ORCPT ); Thu, 26 Jan 2023 06:11:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236312AbjAZLLx (ORCPT ); Thu, 26 Jan 2023 06:11:53 -0500 Received: from smtpweb146.aruba.it (smtpweb146.aruba.it [62.149.158.146]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC65063854 for ; Thu, 26 Jan 2023 03:11:18 -0800 (PST) Received: from asem-TANK-H61.asem.intra ([151.1.184.193]) by Aruba Outgoing Smtp with ESMTPSA id KzrppyQ5bn7VrKzrspdlp8; Thu, 26 Jan 2023 11:52:33 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1674730353; bh=j13KKIJM6fFKosjFnovvgyqOUFOoD8QPhU4cG+FAZMI=; h=From:To:Subject:Date:MIME-Version; b=mAmqc8KP+o2c6Fy9qMAEg4cY9eYB/bhoxSEUVuK1B0Gahe6ZkdrJI2v924g8k7onr oKbcfUPTcmK4+LoMGo15+gK/TJ8DcVIBWfhnEb7nB3raGvtq+7Oj8L/idX9YfT2Jkz +6dvjnlnsdLj2xD3TyO7OxZvbucmh7XsIeWmd7l6Xij+R8k4IfOHORDAQ3ZMKkMnyj Ze61iwZ3oBTijtUTieUHHmmk9jwqv3Im7NqHY7vLwBkvwM2h0bdjrL7lBh30OZgNoQ AtDhNVoTdW5xJnO0SJPRtoDbwQMRqrVJcJtVMgh0lUGRtt0/OySIV8GyjjQN3LIz2j AfHO7+g5OpsEg== 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] Input: ads7846 - don't report pressure for ads7845 Date: Thu, 26 Jan 2023 11:52:25 +0100 Message-Id: <20230126105227.47648-2-l.ellero@asem.it> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230126105227.47648-1-l.ellero@asem.it> References: <20230126105227.47648-1-l.ellero@asem.it> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfDOQITVe5HdccN8ZR7js8LsXxDXfRRRw3BoVo61j0dBfmGWMLnQShJQUqk7l2JrYX3VpXhOiMs57ly0R+i3Gp6liuLXKW55xuGWNA0EDwPqoQlspu9hy G6QDM7ooc0tN39LOWKVFJ88zmjd1J49NgjJ4pngmVSoxGYamRo6pgHZVPVxZYvnmhe4GmF7iIjksSbZ3yVMf4EbdAgY9p+Q4UoNtv/Joa56wYbJDzdSEpO1W QZjjv4U5hOj3nv4Dpvn0/iaa1Pkh8JRd+hFA+J4rC868YFiHzuQj7yDxJ2ai7gJ8Vh1RRMPcirUYWTr91CXqC5FeJQU42gGTozACaG3z5/fof+l0mmU3AA1K XBWWBunJ3WkpXdk+Y6VPMHHojINGWkPUIuQXs3zDYftYjBkXYPxe28RlDpfYjP87SI/8ZdPbEyPRKvWQSiYOh2EnFo3ls9wbamuAdCjWcmpINqsZQkTRn+qW BJMb2Nw5by6rOWLQIhraBL/3c7IIdRAxIpGNTnEU9bK0rMrHhQdj+OvbjAIW1UQBhDE8TDvv96YoFF8OH+ckXZVK/6BLFcFLDAcNiA0EY5Dse5YwLD9/+mQf wAsJFD7HDN7YkFyKIpqdauf/ Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org ADS7845 doesn't support pressure. Avoid the following error reported by libinput-list-devices: "ADS7845 Touchscreen: kernel bug: device has min == max on ABS_PRESSURE". Fixes: ffa458c1bd9b ("spi: ads7846 driver") 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 4c3dd01902d0..f11b444f2138 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 Jan 26 10:52:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Ellero X-Patchwork-Id: 647808 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 76406C05027 for ; Thu, 26 Jan 2023 11:11:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236541AbjAZLLm (ORCPT ); Thu, 26 Jan 2023 06:11:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236312AbjAZLLm (ORCPT ); Thu, 26 Jan 2023 06:11:42 -0500 Received: from smtpweb146.aruba.it (smtpweb146.aruba.it [62.149.158.146]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38B566224B for ; Thu, 26 Jan 2023 03:11:06 -0800 (PST) Received: from asem-TANK-H61.asem.intra ([151.1.184.193]) by Aruba Outgoing Smtp with ESMTPSA id KzrppyQ5bn7VrKzrupdlrh; Thu, 26 Jan 2023 11:52:35 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1674730355; bh=JG0jmrScq7HDhSnDu4lEvoGIvGCbBbbHV1PcVq1TxZM=; h=From:To:Subject:Date:MIME-Version; b=kVUW6EUfCHGR2k9THRY4IGx8laSdYnhgAMOsNdPMJc+77jsS4fgi4x0qfD0SdTREq u0Pnx0ImCysFElN0RYNaMfsoFPCRgK9LqVP6WFTPppUU7MOd9u0+dJOTQXPt1YAOyr wllycmZV8/O3MUi8Ox7dibbyC+9ThxS4uOSz0nD8UXaa8dcfDoed69/kX4rLrLvqc7 wihTsNy+3SLo68v60HpFjesXMu9JkY8TJFoKjuFHkCWbRjjvX7mHQ4iHN28V69CXms xmGAKn3NPT0Qxa3xhIv/b7JCgdypLRvPK6guVw+ZLKVPplxFnzIzYLVQVQ2K8SgWrF h1E1EZToIupoA== 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] Input: ads7846 - always set last command to PWRDOWN Date: Thu, 26 Jan 2023 11:52:26 +0100 Message-Id: <20230126105227.47648-3-l.ellero@asem.it> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230126105227.47648-1-l.ellero@asem.it> References: <20230126105227.47648-1-l.ellero@asem.it> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfOOjddogN4mr6xda53A3MDhDxr3whbrWm+moEL9qcULUCce/+FmI75Eh2hDAEdS09t4zzob0nS0hpTQHSltY4Bjq3PgitV+/BUQQS+r528TFUmNWvttn ACCwAAV7Cq+2U1iQ2Wqql5xuRm27CjAniHweL9jDYo17aurxMskO1bf17EPz02sdNwqjHge/PsuqJTi53KaHs8pyRTEDj8cRo6yeYTsw6mCvXykC19qHvazL 8A5yGwXiw+37bdQmR6F8lIzeLmU0zj0KUqrZJw0OXNZOwudWuuMDXlbF+KuuU0enC1yf8Fw3czmkJNACyfNNP26mqEQupR6F8IWTCJeKGxbistjHnluZQlak 4fNU1Fnr3cakOaNwtbJuWcn5V5vEXxBskXvKU6cltVVtlmHivhTR2KMAPRHJCKQ77cxZreQ9TffIDozi9q5JioKajhOHMN9I2a5yiJAd4pMxYkMr27kjArv0 J28qjIor8f5AM+l8n7RnUwkNsaVZr6vzd5AiNb+1JhPZ2zd0YHOAPLW952i6iHWxHwgFBYRReVwL7H7UvyROknrMhWkdbor89GV3AOQrmmLtaYW2YuGN5XjD kxetBeDGSgW5qkZHq3Edc8Lk 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. Fix this by setting the third (and last) command to PWRDOWN. Fixes: ffa458c1bd9b ("spi: ads7846 driver") 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 f11b444f2138..15da1047a577 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 Jan 26 10:52:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Ellero X-Patchwork-Id: 647393 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 66194C05027 for ; Thu, 26 Jan 2023 11:03:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236849AbjAZLDZ (ORCPT ); Thu, 26 Jan 2023 06:03:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237084AbjAZLDX (ORCPT ); Thu, 26 Jan 2023 06:03:23 -0500 X-Greylist: delayed 646 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Thu, 26 Jan 2023 03:03:20 PST Received: from smtpweb146.aruba.it (smtpweb146.aruba.it [62.149.158.146]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FEFEB741 for ; Thu, 26 Jan 2023 03:03:20 -0800 (PST) Received: from asem-TANK-H61.asem.intra ([151.1.184.193]) by Aruba Outgoing Smtp with ESMTPSA id KzrppyQ5bn7VrKzrwpdlvQ; Thu, 26 Jan 2023 11:52:37 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1674730357; bh=H9c79j0VtyhTiRS4TnW7zV7MIRdHfFiRAQrVb9wLVoY=; h=From:To:Subject:Date:MIME-Version; b=O3rbeiY+zrMVxTbxh3oMC4P4PXec6OLmpaFUaYqGexZoQ+XcA9+n48HJJBntLH7ZF s9hu/lxR9Ea54dt5iyJOC6DdJApWdYH/CWYmvCJov6L0ejNPZDT+6wZJSZfgfiEHrJ e0+LOfrnZ0sdGdZF+nEDX7M7TlIAbO5/vSEsxXeDqW2UzFYZN4S2Fg4En6Y19rUUG8 gOVvPrGZP9y2TGf0ydPaol5gWVEYhFOnGMb7ad5EuoJw0p5oXUN/27WWFFykUCEFdg TzeWhdKkadu59yX4Al9OVcrptfV0mCkmXi63jM0kJT0W6ORD9AOTNDKFrcxN47889o 0O9BRk8vCUgCw== 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] Input: ads7846 - don't check penirq immediately for 7845 Date: Thu, 26 Jan 2023 11:52:27 +0100 Message-Id: <20230126105227.47648-4-l.ellero@asem.it> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230126105227.47648-1-l.ellero@asem.it> References: <20230126105227.47648-1-l.ellero@asem.it> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfHuIE2j3bYbK5nB8eUKiELfmmJoV7gdzP7PFvJTlXY4Xl56qJKHKJb088FjYoJkUOYVRgPpTD5KR7VnGDT8bhHEjyC90kwKQ8uawkqsGN0vnVOhLJnk5 7CoTpTJr0SBXgEi1BRYUuE/4u4ilXoLEAoqtF0M/AEdAH6gHJ/6eXXw3lH0i+3weLKvmbn0y7rvRjGhDQ3EQpELyTFGNk6/PIeCm3TT8OjIiNhTI+2dc6ILE kM3bZMsV9Ew/fi+38tX9HREKBX+sqw+66+fFZDSR3SeprG3qNGGXWop61ErY1V0E75rIEQtdAw0aVbvT106JLx4RDZQnGsBCzPW1kcdhJmqhwlSJBPBsS1u9 58QVty2YIlt5Hai2jnrUGXVNr7y9KT4YfRYj7u0iuYDaqr4nKvxW3GxfwpKyRYGuAC04kgb2AAL34HrTgt7gJ9ndp8ad6RGRo5zsZKTm24Lpsv9q6Beoq54O IOFfbAr6XFVy0XhRVKublbFj/vwbJaGrAHokHnPfDUDbkzIGSfas0U6ZFGWlrJJOCxX0xx+CUnIG+btP++FZ07Vk5IM+hVi9Uc/AbNr50tQaq4M8heVJmsSD SMWI204EqQxoCHssmTJyb2+P 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. Fixes: ffa458c1bd9b ("spi: ads7846 driver") 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 15da1047a577..17f11bce8113 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;