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 D04B4C43216 for ; Mon, 30 Aug 2021 13:59:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B023660ED4 for ; Mon, 30 Aug 2021 13:59:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236919AbhH3N7w (ORCPT ); Mon, 30 Aug 2021 09:59:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:54030 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236874AbhH3N7v (ORCPT ); Mon, 30 Aug 2021 09:59: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 2557A604D7; Mon, 30 Aug 2021 13:58:51 +0000 (UTC) Date: Mon, 30 Aug 2021 15:02:03 +0100 From: Jonathan Cameron To: Miquel Raynal Cc: Lars-Peter Clausen , Peter Meerwald-Stadler , Rob Herring , Lee Jones , bcousson@baylibre.com, Tony Lindgren , Tero Kristo , Michael Turquette , Stephen Boyd , Thomas Petazzoni , "Ryan J . Barnett" , linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-input@vger.kernel.org, linux-omap@vger.kernel.org, linux-clk@vger.kernel.org Subject: Re: [PATCH 26/40] mfd: ti_am335x_tscadc: Introduce has_tsc Message-ID: <20210830150203.51cf1453@jic23-huawei> In-Reply-To: <20210825152518.379386-27-miquel.raynal@bootlin.com> References: <20210825152518.379386-1-miquel.raynal@bootlin.com> <20210825152518.379386-27-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: devicetree@vger.kernel.org On Wed, 25 Aug 2021 17:25:04 +0200 Miquel Raynal wrote: > One way of knowing which hardware we are dealing with is to check its > compatible. When this must be done at several places, it's best to use a > proper boolean for that. ->has_tsc indicates if there is a touchscreen > controller available (meaning it's a am33xx-like ADC) or not but does > not indicate if it is actually used (that is the purpose of the use_tsc > boolean in the probe). > > Introducing this boolean helps making a difference in the code between > what is generic to both types of ADCs and what is specific to the am33xx > hardware before introducing support for the am437x hardware. > > Signed-off-by: Miquel Raynal Seems sensible to me. Reviewed-by: Jonathan Cameron > --- > drivers/mfd/ti_am335x_tscadc.c | 37 +++++++++++++++++----------- > include/linux/mfd/ti_am335x_tscadc.h | 1 + > 2 files changed, 23 insertions(+), 15 deletions(-) > > diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c > index 30f53cdb41f8..a40091830cea 100644 > --- a/drivers/mfd/ti_am335x_tscadc.c > +++ b/drivers/mfd/ti_am335x_tscadc.c > @@ -105,8 +105,9 @@ static void tscadc_idle_config(struct ti_tscadc_dev *tscadc) > { > unsigned int idleconfig; > > - idleconfig = STEPCONFIG_YNN | STEPCONFIG_INM_ADCREFM | > - STEPCONFIG_INP_ADCREFM | STEPCONFIG_YPN; > + idleconfig = STEPCONFIG_INM_ADCREFM | STEPCONFIG_INP_ADCREFM; > + if (tscadc->data->has_tsc) > + idleconfig |= STEPCONFIG_YNN | STEPCONFIG_YPN; > > regmap_write(tscadc->regmap, REG_IDLECONFIG, idleconfig); > } > @@ -139,11 +140,13 @@ static int ti_tscadc_probe(struct platform_device *pdev) > > tscadc->data = of_device_get_match_data(&pdev->dev); > > - node = of_get_child_by_name(pdev->dev.of_node, "tsc"); > - of_property_read_u32(node, "ti,wires", &tscmag_wires); > - of_property_read_u32(node, "ti,coordiante-readouts", &readouts); > - if (tscmag_wires) > - use_tsc = true; > + if (tscadc->data->has_tsc) { > + node = of_get_child_by_name(pdev->dev.of_node, "tsc"); > + of_property_read_u32(node, "ti,wires", &tscmag_wires); > + of_property_read_u32(node, "ti,coordiante-readouts", &readouts); > + 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) { > @@ -218,15 +221,18 @@ static int ti_tscadc_probe(struct platform_device *pdev) > regmap_write(tscadc->regmap, REG_CLKDIV, tscadc->clk_div); > > /* Set the control register bits */ > - tscadc->ctrl = CNTRLREG_TSC_STEPCONFIGWRT | CNTRLREG_STEPID; > - regmap_write(tscadc->regmap, REG_CTRL, tscadc->ctrl); > + tscadc->ctrl = CNTRLREG_STEPID; > + if (tscadc->data->has_tsc) { > + tscadc->ctrl |= CNTRLREG_TSC_STEPCONFIGWRT; > + regmap_write(tscadc->regmap, REG_CTRL, tscadc->ctrl); > + if (use_tsc) { > + tscadc->ctrl |= CNTRLREG_TSC_ENB; > + if (tscmag_wires == 5) > + tscadc->ctrl |= CNTRLREG_TSC_5WIRE; > + else > + tscadc->ctrl |= CNTRLREG_TSC_4WIRE; > + } > > - if (use_tsc) { > - tscadc->ctrl |= CNTRLREG_TSC_ENB; > - if (tscmag_wires == 5) > - tscadc->ctrl |= CNTRLREG_TSC_5WIRE; > - else > - tscadc->ctrl |= CNTRLREG_TSC_4WIRE; > } > > tscadc_idle_config(tscadc); > @@ -321,6 +327,7 @@ static int __maybe_unused tscadc_resume(struct device *dev) > static SIMPLE_DEV_PM_OPS(tscadc_pm_ops, tscadc_suspend, tscadc_resume); > > static const struct ti_tscadc_data tscdata = { > + .has_tsc = true, > .name_tscmag = "TI-am335x-tsc", > .compat_tscmag = "ti,am3359-tsc", > .name_adc = "TI-am335x-adc", > diff --git a/include/linux/mfd/ti_am335x_tscadc.h b/include/linux/mfd/ti_am335x_tscadc.h > index d5e2ff8dc84a..082b2af94263 100644 > --- a/include/linux/mfd/ti_am335x_tscadc.h > +++ b/include/linux/mfd/ti_am335x_tscadc.h > @@ -163,6 +163,7 @@ > #define TSCADC_CELLS 2 > > struct ti_tscadc_data { > + bool has_tsc; > char *name_tscmag; > char *compat_tscmag; > char *name_adc;