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=-11.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,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 CB366C5519F for ; Sat, 14 Nov 2020 17:15:41 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6B00820B80 for ; Sat, 14 Nov 2020 17:15:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="U33YeJ1+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6B00820B80 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jic23.retrosnub.co.uk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=O2IxyIMFk3lOU+H4kp/lgWhe4UhLXF8db0cJY5XaZNc=; b=U33YeJ1+1PXMlnwW1L5c56MP8 ZdF5/iWXj1XUByfI5Q7uaeK8wCuIXeGYTjFL0KSf5NHUL6ZuuzDsbr71U8bncWMdkWVF9Osw0ulPG uoPGDYKUbqgHLKeJAZ+Q2lENhQB/JLdG6gUkpj9AYPzIgW3etPvv5yUpU58v9aJ70Byv6OoVxwtex ymA+mkVZpI706f6AGjluqvPmtfKV19/uE09bsudRAqld/d7SuFZtHwgAtcOMEGS+T38xACDdX6OwG 4Z23pB5HdnADa48HNqMhkh1CnjncW7Ghf/39TPJz96mb6He6tu+ZMutEAAM+OkdpCYN+J8SyU9cZF CK2yyqwUQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kdz8r-0005fq-Nu; Sat, 14 Nov 2020 17:15:13 +0000 Received: from saturn.retrosnub.co.uk ([46.235.226.198]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kdz8n-0005dS-BA for linux-arm-kernel@lists.infradead.org; Sat, 14 Nov 2020 17:15:11 +0000 Received: from archlinux (cpc149474-cmbg20-2-0-cust94.5-4.cable.virginm.net [82.4.196.95]) by saturn.retrosnub.co.uk (Postfix; Retrosnub mail submission) with ESMTPSA id ADA619E0090; Sat, 14 Nov 2020 17:15:03 +0000 (GMT) Date: Sat, 14 Nov 2020 17:15:02 +0000 From: Jonathan Cameron To: Alexandre Belloni Subject: Re: [PATCH 5/9] iio: adc: at91_adc: merge at91_adc_probe_dt back in at91_adc_probe Message-ID: <20201114171502.02fcd603@archlinux> In-Reply-To: <20201114170804.4b51c84b@archlinux> References: <20201113212650.507680-1-alexandre.belloni@bootlin.com> <20201113212650.507680-6-alexandre.belloni@bootlin.com> <20201114170804.4b51c84b@archlinux> X-Mailer: Claws Mail 3.17.7 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201114_121509_616492_CEE6CD8E X-CRM114-Status: GOOD ( 27.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Lars-Peter Clausen , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Ludovic Desroches , Peter Meerwald-Stadler , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Sat, 14 Nov 2020 17:08:04 +0000 Jonathan Cameron wrote: > On Fri, 13 Nov 2020 22:26:46 +0100 > Alexandre Belloni wrote: > > > at91_adc_probe_dt is now small enough to be merged back in at91_adc_probe. > > > > Signed-off-by: Alexandre Belloni > Minor largely unrelated suggestion inline as we are touching this code. > Ignore that, you do it in the next patch which is better anyway :) Jonathan > Thanks, > > Jonathan > > > --- > > drivers/iio/adc/at91_adc.c | 118 +++++++++++++++---------------------- > > 1 file changed, 49 insertions(+), 69 deletions(-) > > > > diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c > > index 83539422b704..9f05eb722f5e 100644 > > --- a/drivers/iio/adc/at91_adc.c > > +++ b/drivers/iio/adc/at91_adc.c > > @@ -833,70 +833,6 @@ static int at91_adc_probe_dt_ts(struct device_node *node, > > } > > } > > > > -static int at91_adc_probe_dt(struct iio_dev *idev, > > - struct platform_device *pdev) > > -{ > > - struct at91_adc_state *st = iio_priv(idev); > > - struct device_node *node = pdev->dev.of_node; > > - int ret; > > - u32 prop; > > - char *s; > > - > > - st->caps = (struct at91_adc_caps *) > > - of_match_device(at91_adc_dt_ids, &pdev->dev)->data; > > - > > - st->use_external = of_property_read_bool(node, "atmel,adc-use-external-triggers"); > > - > > - if (of_property_read_u32(node, "atmel,adc-channels-used", &prop)) { > > - dev_err(&idev->dev, "Missing adc-channels-used property in the DT.\n"); > > - ret = -EINVAL; > > - goto error_ret; > > - } > > - st->channels_mask = prop; > > - > > - st->sleep_mode = of_property_read_bool(node, "atmel,adc-sleep-mode"); > > - > > - if (of_property_read_u32(node, "atmel,adc-startup-time", &prop)) { > > - dev_err(&idev->dev, "Missing adc-startup-time property in the DT.\n"); > > - ret = -EINVAL; > > - goto error_ret; > > - } > > - st->startup_time = prop; > > - > > - prop = 0; > > - of_property_read_u32(node, "atmel,adc-sample-hold-time", &prop); > > - st->sample_hold_time = prop; > > - > > - if (of_property_read_u32(node, "atmel,adc-vref", &prop)) { > > - dev_err(&idev->dev, "Missing adc-vref property in the DT.\n"); > > - ret = -EINVAL; > > - goto error_ret; > > - } > > - st->vref_mv = prop; > > - > > - st->res = st->caps->high_res_bits; > > - if (st->caps->low_res_bits && > > - !of_property_read_string(node, "atmel,adc-use-res", (const char **)&s) > > - && !strcmp(s, "lowres")) > > - st->res = st->caps->low_res_bits; > > - > > - dev_info(&idev->dev, "Resolution used: %u bits\n", st->res); > > - > > - st->registers = &st->caps->registers; > > - st->num_channels = st->caps->num_channels; > > - > > - /* Check if touchscreen is supported. */ > > - if (st->caps->has_ts) > > - return at91_adc_probe_dt_ts(node, st, &idev->dev); > > - else > > - dev_info(&idev->dev, "not support touchscreen in the adc compatible string.\n"); > > - > > - return 0; > > - > > -error_ret: > > - return ret; > > -} > > - > > static const struct iio_info at91_adc_info = { > > .read_raw = &at91_adc_read_raw, > > }; > > @@ -1062,10 +998,12 @@ static void at91_ts_unregister(struct at91_adc_state *st) > > static int at91_adc_probe(struct platform_device *pdev) > > { > > unsigned int prsc, mstrclk, ticks, adc_clk, adc_clk_khz, shtim; > > + struct device_node *node = pdev->dev.of_node; > > int ret; > > struct iio_dev *idev; > > struct at91_adc_state *st; > > - u32 reg; > > + u32 reg, prop; > > + char *s; > > > > idev = devm_iio_device_alloc(&pdev->dev, sizeof(struct at91_adc_state)); > > if (!idev) > > @@ -1073,9 +1011,52 @@ static int at91_adc_probe(struct platform_device *pdev) > > > > st = iio_priv(idev); > > > > - ret = at91_adc_probe_dt(idev, pdev); > > - if (ret) > > - return ret; > > + st->caps = (struct at91_adc_caps *) > > + of_match_device(at91_adc_dt_ids, &pdev->dev)->data; > > of_device_get match_data - obviously an unrelated change but trivial enough > I'd just slip it in this patch (unless you have it a later one!) > > That returns a void * so no need for the cast. > > > + > > + st->use_external = of_property_read_bool(node, "atmel,adc-use-external-triggers"); > > + > > + if (of_property_read_u32(node, "atmel,adc-channels-used", &prop)) { > > + dev_err(&idev->dev, "Missing adc-channels-used property in the DT.\n"); > > + return -EINVAL; > > + } > > + st->channels_mask = prop; > > + > > + st->sleep_mode = of_property_read_bool(node, "atmel,adc-sleep-mode"); > > + > > + if (of_property_read_u32(node, "atmel,adc-startup-time", &prop)) { > > + dev_err(&idev->dev, "Missing adc-startup-time property in the DT.\n"); > > + return -EINVAL; > > + } > > + st->startup_time = prop; > > + > > + prop = 0; > > + of_property_read_u32(node, "atmel,adc-sample-hold-time", &prop); > > + st->sample_hold_time = prop; > > + > > + if (of_property_read_u32(node, "atmel,adc-vref", &prop)) { > > + dev_err(&idev->dev, "Missing adc-vref property in the DT.\n"); > > + return -EINVAL; > > + } > > + st->vref_mv = prop; > > + > > + st->res = st->caps->high_res_bits; > > + if (st->caps->low_res_bits && > > + !of_property_read_string(node, "atmel,adc-use-res", (const char **)&s) > > + && !strcmp(s, "lowres")) > > + st->res = st->caps->low_res_bits; > > + > > + dev_info(&idev->dev, "Resolution used: %u bits\n", st->res); > > + > > + st->registers = &st->caps->registers; > > + st->num_channels = st->caps->num_channels; > > + > > + /* Check if touchscreen is supported. */ > > + if (st->caps->has_ts) { > > + ret = at91_adc_probe_dt_ts(node, st, &idev->dev); > > + if (ret) > > + return ret; > > + } > > > > platform_set_drvdata(pdev, idev); > > > > @@ -1091,7 +1072,6 @@ static int at91_adc_probe(struct platform_device *pdev) > > if (IS_ERR(st->reg_base)) > > return PTR_ERR(st->reg_base); > > > > - > Stray change that shouldn't be in this patch ideally but not that important. > > > /* > > * Disable all IRQs before setting up the handler > > */ > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel