From patchwork Sun Nov 7 11:22:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 12606787 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27DF0C433EF for ; Sun, 7 Nov 2021 11:24:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0D1B4613AC for ; Sun, 7 Nov 2021 11:24:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234549AbhKGL1G (ORCPT ); Sun, 7 Nov 2021 06:27:06 -0500 Received: from smtp-32-i2.italiaonline.it ([213.209.12.32]:55594 "EHLO libero.it" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S234554AbhKGL1E (ORCPT ); Sun, 7 Nov 2021 06:27:04 -0500 Received: from passgat-Modern-14-A10M.homenet.telecomitalia.it ([213.45.67.127]) by smtp-32.iol.local with ESMTPA id jgG9mbDBMCVSejgGWmjsO7; Sun, 07 Nov 2021 12:23:21 +0100 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021; t=1636284201; bh=5cQItZFlPLSWjbLUBhR1OrUoG0HfywhVMmQfcpeIMjE=; h=From; b=SEfeX0Fr47RrTqctxX5JRECVjAHyhozljpBcZZfS/YFAlS4+FOxdcFKjfDwQIufLc Jn99g8fGChR4kGk/moDzm3TIc8zfOrwWgIg/6KsTVxCQCb8xToxpKznXYX7ki0FQ7O +5iX3Mh00GA64oCqVQUiluwCdUXNpjtRo54I3P8oQ/GGm92QnUtF5v44DhkrDte+O0 Un5IEB6qjODvrCzUF5fOq7lT8bCBxUYAphVL8YCWwjNH2/YaBpTxloYVAxpSRsavLh Eoihg7lGOB/41AhX/3eO5qUCk8MeRoNCenj756wjbzwp0/b0Vk1lJrTFp39vYtjpW3 RpLML7+JNtlkg== X-CNFS-Analysis: v=2.4 cv=M/2Ilw8s c=1 sm=1 tr=0 ts=6187b729 cx=a_exe a=Vk63IOK+/LoQucGDvce7tA==:117 a=Vk63IOK+/LoQucGDvce7tA==:17 a=Lf7JvCFZlXs7EqoJDM0A:9 From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-input@vger.kernel.org, Lee Jones , Rachna Patil , Sebastian Andrzej Siewior , Dmitry Torokhov , Dario Binacchi Subject: [RESEND PATCH 1/6] input: ti_am335x_tsc: set ADCREFM for X configuration Date: Sun, 7 Nov 2021 12:22:31 +0100 Message-Id: <20211107112236.7969-2-dariobin@libero.it> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211107112236.7969-1-dariobin@libero.it> References: <20211107112236.7969-1-dariobin@libero.it> X-CMAE-Envelope: MS4xfKwS3peoja97ebgup13q1Bdw9aa2LVOZMqUcBaQmbJhV6KyRUFW0r8WhfdcuXZCXWU+Ac45kTBzWpkPkMChyvXepWG7HRzHk4Av6nLpdwSpdZBpUFxmI 8Ioo7+AbV6ffsA2JaZUMErWSDAQKVgoo4f3xZRXXFencgQ60vxDgd9+NBm/tvgDsi8d2OvcG59fHYqpguTkd2Ml6sWFdG7yY8g2WJTibHa7oY4xZFOwHpLbr TIGmRlVe5/ag/+2WujNnydf9nzGhvqMe0MaF/E+b1CHOQxAjTWmOc1siOHyIWvo4q7JX+OM4X4A/4CrLacEKqoWmqGtfw1IX/ZfCqSr1lUrKpsmt5aKrc5UM A9JGRAbiWYLU9kpl4Cx++s6gE0uCTtS/AyoinPDGBZdlcmz4oF0xqoWo6+GB6KZ5ojOtwZNFstR5i0LUEi5ghplA8jZCuQ== Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org As reported by the STEPCONFIG[1-16] registered field descriptions of the TI reference manual, for the ADC "in single ended, SEL_INM_SWC_3_0 must be 1xxx". Unlike the Y and Z coordinates, this bit has not been set for the step configuration registers used to sample the X coordinate. Fixes: 1b8be32e691 ("Input: add support for TI Touchscreen controller") Signed-off-by: Dario Binacchi --- drivers/input/touchscreen/ti_am335x_tsc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c index 83e685557a19..fd3ffdd23470 100644 --- a/drivers/input/touchscreen/ti_am335x_tsc.c +++ b/drivers/input/touchscreen/ti_am335x_tsc.c @@ -131,7 +131,8 @@ static void titsc_step_config(struct titsc *ts_dev) u32 stepenable; config = STEPCONFIG_MODE_HWSYNC | - STEPCONFIG_AVG_16 | ts_dev->bit_xp; + STEPCONFIG_AVG_16 | ts_dev->bit_xp | + STEPCONFIG_INM_ADCREFM; switch (ts_dev->wires) { case 4: config |= STEPCONFIG_INP(ts_dev->inp_yp) | ts_dev->bit_xn; From patchwork Sun Nov 7 11:22:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 12606789 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A31EC433F5 for ; Sun, 7 Nov 2021 11:24:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 53BF9613B3 for ; Sun, 7 Nov 2021 11:24:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234611AbhKGL1M (ORCPT ); Sun, 7 Nov 2021 06:27:12 -0500 Received: from smtp-32-i2.italiaonline.it ([213.209.12.32]:58633 "EHLO libero.it" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S234554AbhKGL1M (ORCPT ); Sun, 7 Nov 2021 06:27:12 -0500 Received: from passgat-Modern-14-A10M.homenet.telecomitalia.it ([213.45.67.127]) by smtp-32.iol.local with ESMTPA id jgG9mbDBMCVSejgGgmjsQ8; Sun, 07 Nov 2021 12:23:29 +0100 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021; t=1636284209; bh=/t4afwvWKwIcozWo7+JhPaKv7o+8VqLY8nNdi3B2CXc=; h=From; b=fHzteAiyasVaRsB0cI4j2Oyac+re88KVXpZPW3ixdg/b1A1O6Sl+3Ijko4k7IDCd8 I8vzkxug8li9bQgz4XulyrVHxXNF6eTuXSdeJtc/vgaK48JVo6qVusJrEHuPQqNoZ+ cG/12BCOEefx9zUZCtf273N+lkQQSquBIm8U088grEQImyyEM1b+b4WJuaP6nHczll dGsL3iFYkm2Z17V5UNxpeTPogrBZt/RVvCLKPvZHzuDP0qxSb6jQPOOX3NAfvCwdCn cKqwmg+IQgd0PUReJDYt6e+A+6BG667UX/RtA+sx/821FPUum1gmcDhBLBqEsAnXsV 7Tx/lWbgUYYEQ== X-CNFS-Analysis: v=2.4 cv=M/2Ilw8s c=1 sm=1 tr=0 ts=6187b731 cx=a_exe a=Vk63IOK+/LoQucGDvce7tA==:117 a=Vk63IOK+/LoQucGDvce7tA==:17 a=Us_wMsjpGDddDCpAM8cA:9 From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-input@vger.kernel.org, Lee Jones , Rachna Patil , Sebastian Andrzej Siewior , Dmitry Torokhov , Dario Binacchi Subject: [RESEND PATCH 2/6] input: ti_am335x_tsc: fix STEPCONFIG setup for Z2 Date: Sun, 7 Nov 2021 12:22:32 +0100 Message-Id: <20211107112236.7969-3-dariobin@libero.it> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211107112236.7969-1-dariobin@libero.it> References: <20211107112236.7969-1-dariobin@libero.it> X-CMAE-Envelope: MS4xfFRxzP24/5zuorUvVQDiFCV5cQ8vaaiE4fcDq+Pglv84vVqf9dAxEIMxaGxzjV/zDs+gnxOvr5IvcFgy0EpZ9Rnn47AuvIM7Y6KRS3hUupugxZxXpLKt TCADoVews87briZKEdV5EAvQOu78va0hSrGFZo2c4Y5bUA+5cpl5exp+PawQtHrgomMrpRSsLLADYwYztXScFwBP2RzayO1wV9p1ynCKNORIwCSV4F9GcPt1 hku3cgTBc/NUlRDiuUzbEdgaU+eiWvT8uFSnWWDmSqJ5WkCTo0lB85yBYhg00iMKdq3EhZFwUWdammwJeTq+OPUcRB81AM+C7Cabd/qRcIvYMbTWUTw0/HBm tJ2Snpg1v3E9vbbvIEUTDn0iBNYbSpMZvFXXlY8gB2cNQMT6iW5aC0q5iLN6SFOdDabGrUnKfi0BzIM+81wEzZAaNhrwOA== Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org The Z2 step configuration doesn't erase the SEL_INP_SWC_3_0 bit-field before setting the ADC channel. This way its value could be corrupted by the ADC channel selected for the Z1 coordinate. Fixes: 8c896308fea ("input: ti_am335x_adc: use only FIFO0 and clean up a little") Signed-off-by: Dario Binacchi --- drivers/input/touchscreen/ti_am335x_tsc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c index fd3ffdd23470..cfc943423241 100644 --- a/drivers/input/touchscreen/ti_am335x_tsc.c +++ b/drivers/input/touchscreen/ti_am335x_tsc.c @@ -196,7 +196,10 @@ static void titsc_step_config(struct titsc *ts_dev) STEPCONFIG_OPENDLY); end_step++; - config |= STEPCONFIG_INP(ts_dev->inp_yn); + config = STEPCONFIG_MODE_HWSYNC | + STEPCONFIG_AVG_16 | ts_dev->bit_yp | + ts_dev->bit_xn | STEPCONFIG_INM_ADCREFM | + STEPCONFIG_INP(ts_dev->inp_yn); titsc_writel(ts_dev, REG_STEPCONFIG(end_step), config); titsc_writel(ts_dev, REG_STEPDELAY(end_step), STEPCONFIG_OPENDLY); From patchwork Sun Nov 7 11:22:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 12606791 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A20EBC433EF for ; Sun, 7 Nov 2021 11:24:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8730F613A8 for ; Sun, 7 Nov 2021 11:24:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234633AbhKGL1T (ORCPT ); Sun, 7 Nov 2021 06:27:19 -0500 Received: from smtp-32-i2.italiaonline.it ([213.209.12.32]:55594 "EHLO libero.it" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S234628AbhKGL1T (ORCPT ); Sun, 7 Nov 2021 06:27:19 -0500 Received: from passgat-Modern-14-A10M.homenet.telecomitalia.it ([213.45.67.127]) by smtp-32.iol.local with ESMTPA id jgG9mbDBMCVSejgGomjsRY; Sun, 07 Nov 2021 12:23:36 +0100 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021; t=1636284216; bh=gKMjXidRv+hTtKdP0cTEKHvkvVU5tlKOfJHkhotQeQk=; h=From; b=YwIXf9wJjMtTIBb+87KE/0YFUYQfotTISc6OlABtKnH3Jgray7OfUW6Zak1P6RUja 1g2Q0PDLVkbA/Fsj7WEVHDvzGUy6rW6U69ZpCl4nK3gyQDM7bqgrgBXyyUXQXpuFdg fLC0I/CN7q3d2DpGUimHwxACHsw3LAEy+8/YQdSDMVXPr3L/LO4gjEUJlWP25iV+x3 4c26p0pFrMJCA0TaR2vc/0duOhgSE+up3fcYkte/pdtFTqI8O+IKKxfDpL1vCJ4Hcc aww+oyg+x/phOi359CiX0BatIDTS8nrM/NLz1SBgTE72uPoR4fIU3yMofC5ZCjC1dG BRvDj5zfsXYEw== X-CNFS-Analysis: v=2.4 cv=M/2Ilw8s c=1 sm=1 tr=0 ts=6187b738 cx=a_exe a=Vk63IOK+/LoQucGDvce7tA==:117 a=Vk63IOK+/LoQucGDvce7tA==:17 a=VZkyjkMPts0tdjHXfkQA:9 From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-input@vger.kernel.org, Lee Jones , Rachna Patil , Sebastian Andrzej Siewior , Dmitry Torokhov , Dario Binacchi Subject: [RESEND PATCH 3/6] input: ti_am335x_tsc: lower the X and Y sampling time Date: Sun, 7 Nov 2021 12:22:33 +0100 Message-Id: <20211107112236.7969-4-dariobin@libero.it> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211107112236.7969-1-dariobin@libero.it> References: <20211107112236.7969-1-dariobin@libero.it> X-CMAE-Envelope: MS4xfHIfLyoeARe7sVqFZzLANFZI79BfN07+a5RpAlTOxwcYM1OUaxGCLePLWxax2lPBeXeQBcd5OUmbF0C7SKw3bwvMqH6Q6kaSjfjf0C9fdbGUY5CFKf+b lrqsVLWYR/BR+yubMBX20sbtR4a3vLm2g95nC08AYKC6oxahN1bf2nmx/ZXg78zVpghsY8GunZr9P2Ct+EI3WlqzG0O21RnMdmIQxlRuyXqTvBXf3QyNyCQQ K4Q+qEuHBtPyS9FQEKHNGec4XmS7TJZblG62iTM1jBo8XncZOJC7Xe39+PQHT5qKu6QeFxYqVmFz9hK3sPz7SIO/sj2RCMaw/9hjNixBaaarB4dSfY+QxF/Y tqRI4O2Xz3QRR6x7yvt+518kImD7l4UiZpTn+dhHADDwPzvc3cRow7hmDLGN/VeEIm+UXFrGXXTq4FAbL0fnmfmgfV1CeQ== Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org The open delay time has to be applied only on the first sample of the X/Y coordinates because on the following samples the ADC channel is not changed. Removing this time from the samples after the first one, "ti,coordinate-readouts" greater than 1, decreases the total acquisition time, allowing to increase the number of acquired coordinates in the time unit. Signed-off-by: Dario Binacchi --- drivers/input/touchscreen/ti_am335x_tsc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c index cfc943423241..f4ef218bc1b8 100644 --- a/drivers/input/touchscreen/ti_am335x_tsc.c +++ b/drivers/input/touchscreen/ti_am335x_tsc.c @@ -126,7 +126,7 @@ static int titsc_config_wires(struct titsc *ts_dev) static void titsc_step_config(struct titsc *ts_dev) { unsigned int config; - int i; + int i, n; int end_step, first_step, tsc_steps; u32 stepenable; @@ -151,9 +151,11 @@ static void titsc_step_config(struct titsc *ts_dev) first_step = TOTAL_STEPS - tsc_steps; /* Steps 16 to 16-coordinate_readouts is for X */ end_step = first_step + tsc_steps; + n = 0; for (i = end_step - ts_dev->coordinate_readouts; i < end_step; i++) { titsc_writel(ts_dev, REG_STEPCONFIG(i), config); - titsc_writel(ts_dev, REG_STEPDELAY(i), STEPCONFIG_OPENDLY); + titsc_writel(ts_dev, REG_STEPDELAY(i), + n++ == 0 ? STEPCONFIG_OPENDLY : 0); } config = 0; @@ -175,9 +177,11 @@ static void titsc_step_config(struct titsc *ts_dev) /* 1 ... coordinate_readouts is for Y */ end_step = first_step + ts_dev->coordinate_readouts; + n = 0; for (i = first_step; i < end_step; i++) { titsc_writel(ts_dev, REG_STEPCONFIG(i), config); - titsc_writel(ts_dev, REG_STEPDELAY(i), STEPCONFIG_OPENDLY); + titsc_writel(ts_dev, REG_STEPDELAY(i), + n++ == 0 ? STEPCONFIG_OPENDLY : 0); } /* Make CHARGECONFIG same as IDLECONFIG */ From patchwork Sun Nov 7 11:22:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 12606793 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5AFBC433F5 for ; Sun, 7 Nov 2021 11:24:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D026B60F4B for ; Sun, 7 Nov 2021 11:24:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234640AbhKGL11 (ORCPT ); Sun, 7 Nov 2021 06:27:27 -0500 Received: from smtp-32-i2.italiaonline.it ([213.209.12.32]:33734 "EHLO libero.it" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S234639AbhKGL10 (ORCPT ); Sun, 7 Nov 2021 06:27:26 -0500 Received: from passgat-Modern-14-A10M.homenet.telecomitalia.it ([213.45.67.127]) by smtp-32.iol.local with ESMTPA id jgG9mbDBMCVSejgGumjsSv; Sun, 07 Nov 2021 12:23:43 +0100 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021; t=1636284223; bh=EEtrSSWFEIEm+hm9c1Utn/zMqEcLWIoArC5KJHteRL4=; h=From; b=r66t5NSVq2vowqyc1m9pZkYXi/Is2VZMWYAgE8fJOeQcN9IQ3ZE0K1q1GfmJLRCqF +IEqPkIH7SqL1hkbJK+othUcleul13hojyIqJnx6NC06zFSEyftJBB4joDB2wSTDa4 9i9g5iGEBBSOaEKBzO0uDKXE7P8JGmV2nYR2ytqSm3i2zoIUCTOskw3JtgaXa7QJGp 1/FbHRfJULW8CWMK6T7xuLklzT5MDUJ+8UALHqqwE99CAntlhqzyefq8zHAvjgqgT8 GsMfCBbNPb2NWP8t7JUR2HjSFawWqCbu1a9E1VA1V+DpLzis1MQyKHROWgTupW+t2T s2ccXJuoN0GDw== X-CNFS-Analysis: v=2.4 cv=M/2Ilw8s c=1 sm=1 tr=0 ts=6187b73f cx=a_exe a=Vk63IOK+/LoQucGDvce7tA==:117 a=Vk63IOK+/LoQucGDvce7tA==:17 a=VwQbUJbxAAAA:8 a=WGf4WTbLby2_tS91RlMA:9 a=AjGcO6oz07-iQ99wixmX:22 From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-input@vger.kernel.org, Lee Jones , Rachna Patil , Sebastian Andrzej Siewior , Dmitry Torokhov , Dario Binacchi , Rob Herring , devicetree@vger.kernel.org Subject: [RESEND PATCH 4/6] dt-bindings: input: ti-tsc-adc: fix tsc node example Date: Sun, 7 Nov 2021 12:22:34 +0100 Message-Id: <20211107112236.7969-5-dariobin@libero.it> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211107112236.7969-1-dariobin@libero.it> References: <20211107112236.7969-1-dariobin@libero.it> X-CMAE-Envelope: MS4xfGJiT1p+RKZwKdMcJkkVOvukmmvGCfoREfMzSsL7AL23Wlv9dD6Ysj1MPiO60BIVswz4NWCZ3/IayEp3nrNMEjkIzRTnTfsX7ioBma+pwc4e6wCGVitC 8bARPidV7a16pxWfRStWCMda9wzGW/cUI/IWVjsaunoAv1CyYXN3iduhbOMcbV8dLdQhnkSznPCpKkEhmxD7f5bvfMUUEBDo0p/iBgFKmUWmDVB7jfIpnENo DmIgC+pqjarzMwW4zNmGms1JdPLZPwGVsEU385ewB4WracoX9P55E4K1BQGkqpG+YQvSC/xCCGarrmpjCb7pwzL8DER6FHsvkrBSODNGRMrwlo6zXOzDXHgI ceCyAjAn5Alm31PeSEg4+RZr8ENlwcIwJT19pCzXQ4oPq74gxZUoQnrvHqQE01Zmp7Kb2k+/ewCx2j2Qpq/tH5LZPUUul1X12kFmcNq4gTqGgzH8+XNfkPWD W+EfGrccxOGQscRKK3gNsmRqh1q9VPlxyVULKA== Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org The commit c9aeb249bf72e ("Input: ti_am335x_tsc - fix spelling mistake in TSC/ADC DT binding") didn't fix the typo mistake in the tsc node of the example. Signed-off-by: Dario Binacchi Acked-by: Rob Herring --- .../devicetree/bindings/input/touchscreen/ti-tsc-adc.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt b/Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt index aad5e34965eb..2013fd7c4a10 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt +++ b/Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt @@ -77,7 +77,7 @@ Example: tsc { ti,wires = <4>; ti,x-plate-resistance = <200>; - ti,coordiante-readouts = <5>; + ti,coordinate-readouts = <5>; ti,wire-config = <0x00 0x11 0x22 0x33>; ti,charge-delay = <0x400>; }; From patchwork Sun Nov 7 11:22:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 12606781 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 049FDC433F5 for ; Sun, 7 Nov 2021 11:23:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CE38C613A8 for ; Sun, 7 Nov 2021 11:23:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234500AbhKGL0d (ORCPT ); Sun, 7 Nov 2021 06:26:33 -0500 Received: from smtp-32-i2.italiaonline.it ([213.209.12.32]:55594 "EHLO libero.it" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S234495AbhKGL0d (ORCPT ); Sun, 7 Nov 2021 06:26:33 -0500 Received: from passgat-Modern-14-A10M.homenet.telecomitalia.it ([213.45.67.127]) by smtp-32.iol.local with ESMTPA id jgG9mbDBMCVSejgH2mjsTx; Sun, 07 Nov 2021 12:23:49 +0100 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021; t=1636284229; bh=uOI5vCuOV2tfAd2+7pOlCZ4OwSmsY8gQEkJvhPRQhRk=; h=From; b=beovk9gqakoD85AVmqqBsH0Om/d2n7Jn/JIlo9n9tG16yBY7PsU0+QS3KvLMGf/VE Yj+9ZFljTkGgV5oXmJqY7NdyAb9wJ5n834Gz8e4lAlpIOO2HZUFNO0PFNUu5CEI8mZ KlclsaDy31iehllLOmY9Pgby6AVIrKjK3+1GCO8ly1KjsbLb+6pp8dV0Hu9chwZtwr L0Rb6gaH3575U0FTrY85gsPlxunY1BQR+s0ZD23O2ZMFdObodWQIu5E7Glvq7jT5Ha wBiLIKnjrqicck9uxVedqpOVpHFSokS4TlKIozbtf2NMHtXCB8/MuDh0pRFXDMTIBo tRVscn3h4E5rQ== X-CNFS-Analysis: v=2.4 cv=M/2Ilw8s c=1 sm=1 tr=0 ts=6187b745 cx=a_exe a=Vk63IOK+/LoQucGDvce7tA==:117 a=Vk63IOK+/LoQucGDvce7tA==:17 a=HtFsc1wawpgt7NxhaP8A:9 From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-input@vger.kernel.org, Lee Jones , Rachna Patil , Sebastian Andrzej Siewior , Dmitry Torokhov , Dario Binacchi Subject: [RESEND PATCH 5/6] mfd: ti_am335x_tscadc: fix reading a tsc property from DT Date: Sun, 7 Nov 2021 12:22:35 +0100 Message-Id: <20211107112236.7969-6-dariobin@libero.it> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211107112236.7969-1-dariobin@libero.it> References: <20211107112236.7969-1-dariobin@libero.it> X-CMAE-Envelope: MS4xfB2gslC9y6Fby7yRL5uQ7MUhCkDDwGz1VqESSgr5efL1J+45Vrnh0uIYqDdZKB1IZVYp3cI1gWNTj5WgASM4ViHUcEKq+UpwuZcDNbyhbfBAKTKg8Q41 Cxh0kLMr1QxQG15y+vSKX9Q4YKcLwuCer/35GGvdVhwbW7LfzItJLookm1/4mt/2p/xUYPfRrOwJIyV5CP7Ks0m1zs1QlJE/lc7B9R9kQrvOG+HZVhINMKtL rcjt8/1/HiXjQhCpioxS77UkMFOwwSYewJpbwxwH9kA20h29rzEMX6c9lI7OFfs4oXDxjo31lnVjjY413Wq3X4Jlthuso5sei06SlrbBEagXXZWbSJr4GzE+ I6MTqUrL5M5nPAqXXQTFrWJ9V1aZPLw4t5RiOs285mu/rLb5JZTKic+IQJ/K9t9kuJQ6N4os/imHqkC0GnW9rRamx0yu8w== Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org There was a spelling mistake on TSC/ADC binding where "coordinate" was spelled as "coordiante". As done by commit c9aeb249bf72 ("Input: ti_am335x_tsc - fix spelling mistake in TSC/ADC DT binding"), "the approach taken was to first use correct spelling and if that fails, fall back to miss-spelled version". Signed-off-by: Dario Binacchi --- drivers/mfd/ti_am335x_tscadc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c index 55adc379f94b..53b7a8b7f571 100644 --- a/drivers/mfd/ti_am335x_tscadc.c +++ b/drivers/mfd/ti_am335x_tscadc.c @@ -141,7 +141,12 @@ static int ti_tscadc_probe(struct platform_device *pdev) node = of_get_child_by_name(pdev->dev.of_node, "tsc"); of_property_read_u32(node, "ti,wires", &tsc_wires); - of_property_read_u32(node, "ti,coordiante-readouts", &readouts); + /* + * Try with the new binding first. If it fails, try again with + * bogus, miss-spelled version. + */ + if (of_property_read_u32(node, "ti,coordinate-readouts", &readouts)) + of_property_read_u32(node, "ti,coordiante-readouts", &readouts); node = of_get_child_by_name(pdev->dev.of_node, "adc"); of_property_for_each_u32(node, "ti,adc-channels", prop, cur, val) { From patchwork Sun Nov 7 11:22:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 12606783 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D471BC433EF for ; Sun, 7 Nov 2021 11:24:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B6DAE613AC for ; Sun, 7 Nov 2021 11:24:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234525AbhKGL0l (ORCPT ); Sun, 7 Nov 2021 06:26:41 -0500 Received: from smtp-32-i2.italiaonline.it ([213.209.12.32]:55594 "EHLO libero.it" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S234528AbhKGL0l (ORCPT ); Sun, 7 Nov 2021 06:26:41 -0500 Received: from passgat-Modern-14-A10M.homenet.telecomitalia.it ([213.45.67.127]) by smtp-32.iol.local with ESMTPA id jgG9mbDBMCVSejgH8mjsV9; Sun, 07 Nov 2021 12:23:57 +0100 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021; t=1636284237; bh=z0f6YHnmWTPy574Y4Y7b2kctkr8UGKCiTD9N4kEgvMc=; h=From; b=eRxYxo1MnaMP+HFfZIr5HqVoTFEm8ETDJr9MqKBdcYTTzcEgZDYs+PWDvR9a3co3A Ufgt8qa8P2Rxp5Uiz0J4kHIEbmEIUyuFp9rX2cwnqfMJqymX4Qm3yMWNsMAa3c2p4Q 5DOHvVcNZWPHBqaDXtTXuaIDfd9uEL7XA1+C472OLXhKtGnwaG6ZHy5J2FxmVVBm1s KZk1JwnKk5p6bPC6ioTtKAs6vAUGbgFlfAvsS+w1rk9fugOoIoqBpvA60NOSiwvlDO Kw0dIo4lKY9P4bukMK51o9CjnUxIARpfLsO31a05LmvRmyWj62bwGy+e9ayTi9zwa0 7hrZQoTGbkAig== X-CNFS-Analysis: v=2.4 cv=M/2Ilw8s c=1 sm=1 tr=0 ts=6187b74d cx=a_exe a=Vk63IOK+/LoQucGDvce7tA==:117 a=Vk63IOK+/LoQucGDvce7tA==:17 a=BhtjshvPcAAyVhBn9nwA:9 From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-input@vger.kernel.org, Lee Jones , Rachna Patil , Sebastian Andrzej Siewior , Dmitry Torokhov , Dario Binacchi Subject: [RESEND PATCH 6/6] mfd: ti_am335x_tscadc: drop the CNTRLREG_8WIRE macro Date: Sun, 7 Nov 2021 12:22:36 +0100 Message-Id: <20211107112236.7969-7-dariobin@libero.it> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211107112236.7969-1-dariobin@libero.it> References: <20211107112236.7969-1-dariobin@libero.it> X-CMAE-Envelope: MS4xfF0lR9aaRRDSlbHcHGrIfxP2uIrIfJ2dnEvPRNuKcvBIQ9SYFTBShI7emdCDK7LmhjV3ZAKDxpB6FglX11uxcyyD108UQR23fYQJQs/SVD6eT9p7ZYzt SW8beUWx4JqE8eIJ4P9SYGaWmSrrFX4nr3og1Eym8EOFE3J/PBSgNJPAcIx8AQAwRmHGotLAVHt+UxLb05WV0I3/TNjf/zWO6hOxZsyOcWCUveOibp0FL+6V duXhSLQqdcEdwOT/ikVlsPyaft9IdeDbkv8FdJDDAX/KoT3M+B1D+BVsAR2TMov9NYF4t8fqUPMXpFdQcQBqxJxLSyVUlbDsZMD4H+9Rsvj+zN5tZ546Cbvz ouaqnz1uSdL+evmxcV2JfBo5RYNFHURriPFKLM8qPw9kMTHAtW0wWOXKHR660yMDTYHN2waWod/OUaFyWeFTlqCvxNq+oA== Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org In TI's reference manual description for the `AFE_Pen_Ctrl' bit-field of the TSC's CTRL register, there is no mention of 8-wire touchscreens. Even commit f0933a60d190 ("mfd: ti_am335x_tscadc: Update logic in CTRL register for 5-wire TS") says that the value of this bit-field must be the same for 4-wire and 8-wire touchscreens. So let's remove the CNTRLREG_8WIRE macro to avoid misunderstandings. Signed-off-by: Dario Binacchi --- include/linux/mfd/ti_am335x_tscadc.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/linux/mfd/ti_am335x_tscadc.h b/include/linux/mfd/ti_am335x_tscadc.h index ffc091b77633..155b2ab13bf8 100644 --- a/include/linux/mfd/ti_am335x_tscadc.h +++ b/include/linux/mfd/ti_am335x_tscadc.h @@ -126,7 +126,6 @@ #define CNTRLREG_AFE_CTRL(val) ((val) << 5) #define CNTRLREG_4WIRE CNTRLREG_AFE_CTRL(1) #define CNTRLREG_5WIRE CNTRLREG_AFE_CTRL(2) -#define CNTRLREG_8WIRE CNTRLREG_AFE_CTRL(3) #define CNTRLREG_TSCENB BIT(7) /* FIFO READ Register */