From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=3.0 tests=BAYES_00,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF9D4C433F5 for ; Sun, 5 Sep 2021 13:13:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9FD6A60F45 for ; Sun, 5 Sep 2021 13:13:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233744AbhIENOv (ORCPT ); Sun, 5 Sep 2021 09:14:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:36890 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229759AbhIENOv (ORCPT ); Sun, 5 Sep 2021 09:14:51 -0400 Received: from jic23-huawei (cpc108967-cmbg20-2-0-cust86.5-4.cable.virginm.net [81.101.6.87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 245C360E93; Sun, 5 Sep 2021 13:13:41 +0000 (UTC) Date: Sun, 5 Sep 2021 14:17:04 +0100 From: Jonathan Cameron To: Miquel Raynal Cc: Lars-Peter Clausen , Peter Meerwald-Stadler , Rob Herring , Dmitry Torokhov , Lee Jones , bcousson@baylibre.com, Tony Lindgren , linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-input@vger.kernel.org, linux-omap@vger.kernel.org, Thomas Petazzoni , Vignesh Raghavendra , Lokesh Vutla , Tero Kristo , Ryan Barnett , Grygorii Strashko , Jason Reeder Subject: Re: [PATCH v2 31/46] mfd: ti_am335x_tscadc: Add a boolean to clarify the presence of a touchscreen Message-ID: <20210905141704.5d3a220b@jic23-huawei> In-Reply-To: <20210902215144.507243-32-miquel.raynal@bootlin.com> References: <20210902215144.507243-1-miquel.raynal@bootlin.com> <20210902215144.507243-32-miquel.raynal@bootlin.com> X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org On Thu, 2 Sep 2021 23:51:29 +0200 Miquel Raynal wrote: > Just checking the number of wires will soon not be enough, add a boolean > to indicated the actual use or not of the touchscreen. > > Certain checks only make sense when there is a touchscreen wired. Make > this checks explicitly depend on the presence of the touchscreen. Good. > > Signed-off-by: Miquel Raynal Reviewed-by: Jonathan Cameron > --- > drivers/mfd/ti_am335x_tscadc.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c > index f30bcdf600fb..cfdef833dffb 100644 > --- a/drivers/mfd/ti_am335x_tscadc.c > +++ b/drivers/mfd/ti_am335x_tscadc.c > @@ -120,6 +120,7 @@ static int ti_tscadc_probe(struct platform_device *pdev) > struct mfd_cell *cell; > struct property *prop; > const __be32 *cur; > + bool use_tsc = false; > u32 val; > int err; > int tscmag_wires = 0, adc_channels = 0, cell_idx = 0, total_channels; > @@ -143,6 +144,8 @@ static int ti_tscadc_probe(struct platform_device *pdev) > of_property_read_u32(node, "ti,wires", &tscmag_wires); > of_property_read_u32(node, "ti,coordiante-readouts", &readouts); > of_node_put(node); > + if (tscmag_wires) > + use_tsc = true; > > node = of_get_child_by_name(pdev->dev.of_node, "adc"); > of_property_for_each_u32(node, "ti,adc-channels", prop, cur, val) { > @@ -168,7 +171,7 @@ static int ti_tscadc_probe(struct platform_device *pdev) > return -EINVAL; > } > > - if (readouts * 2 + 2 + adc_channels > 16) { > + if (use_tsc && (readouts * 2 + 2 + adc_channels > 16)) { > dev_err(&pdev->dev, "Too many step configurations requested\n"); > return -EINVAL; > } > @@ -221,7 +224,7 @@ static int ti_tscadc_probe(struct platform_device *pdev) > > /* Set the control register bits */ > tscadc->ctrl = CNTRLREG_TSC_STEPCONFIGWRT | CNTRLREG_STEPID; > - if (tscmag_wires > 0) { > + if (use_tsc) { > tscadc->ctrl |= CNTRLREG_TSC_ENB; > if (tscmag_wires == 5) > tscadc->ctrl |= CNTRLREG_TSC_5WIRE;