From: Jonathan Cameron <jic23@kernel.org>
To: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
Nicolas Ferre <nicolas.ferre@microchip.com>,
Ludovic Desroches <ludovic.desroches@microchip.com>,
linux-iio@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 07/11] iio: adc: at91_adc: merge at91_adc_probe_dt back in at91_adc_probe
Date: Sat, 28 Nov 2020 15:21:24 +0000 [thread overview]
Message-ID: <20201128152124.24d88b36@archlinux> (raw)
In-Reply-To: <20201117140656.1235055-8-alexandre.belloni@bootlin.com>
On Tue, 17 Nov 2020 15:06:52 +0100
Alexandre Belloni <alexandre.belloni@bootlin.com> wrote:
> at91_adc_probe_dt is now small enough to be merged back in at91_adc_probe.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> Reviewed-by: Ludovic Desroches <ludovic.desroches@microchip.com>
This proved a little more interesting to apply, but I think that is just
down to Alexandru having already made the match_data related change.
Please check I got it right!
Thanks,
Jonathan
> ---
> drivers/iio/adc/at91_adc.c | 117 ++++++++++++++++---------------------
> 1 file changed, 49 insertions(+), 68 deletions(-)
>
> diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
> index 83539422b704..347464844263 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;
> +
> + 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);
>
next prev parent reply other threads:[~2020-11-28 21:52 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-17 14:06 [PATCH v2 00/11] iio: adc: at91_adc: cleanup DT bindings Alexandre Belloni
2020-11-17 14:06 ` [PATCH v2 01/11] iio: adc: at91_adc: remove platform data Alexandre Belloni
2020-11-28 14:04 ` Jonathan Cameron
2020-11-28 14:23 ` Alexandre Belloni
2020-11-28 15:26 ` Jonathan Cameron
2020-11-28 22:28 ` Alexandre Belloni
2020-11-17 14:06 ` [PATCH v2 02/11] iio: adc: at91_adc: rework resolution selection Alexandre Belloni
2020-11-17 14:06 ` [PATCH v2 03/11] dt-bindings:iio:adc:remove atmel,adc-res and atmel,adc-res-names Alexandre Belloni
2020-11-17 14:06 ` [PATCH v2 04/11] dt-bindings:iio:adc:atmel,sama9260-adc: conversion to yaml from at91_adc.txt Alexandre Belloni
2020-11-17 14:06 ` [PATCH v2 05/11] iio: adc: at91_adc: rework trigger definition Alexandre Belloni
2020-11-17 14:06 ` [PATCH v2 06/11] dt-bindings:iio:adc:remove triggers Alexandre Belloni
2020-11-17 14:06 ` [PATCH v2 07/11] iio: adc: at91_adc: merge at91_adc_probe_dt back in at91_adc_probe Alexandre Belloni
2020-11-28 15:21 ` Jonathan Cameron [this message]
2020-11-17 14:06 ` [PATCH v2 08/11] iio: adc: at91_adc: remove forward declaration Alexandre Belloni
2020-11-17 14:06 ` [PATCH v2 09/11] ARM: dts: at91: sama5d3: use proper ADC compatible Alexandre Belloni
2020-11-17 14:06 ` [PATCH v2 10/11] ARM: dts: at91: at91sam9rl: fix ADC triggers Alexandre Belloni
2020-11-17 14:06 ` [PATCH v2 11/11] ARM: dts: at91: remove deprecated ADC properties Alexandre Belloni
2020-11-21 15:56 ` [PATCH v2 00/11] iio: adc: at91_adc: cleanup DT bindings Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201128152124.24d88b36@archlinux \
--to=jic23@kernel.org \
--cc=alexandre.belloni@bootlin.com \
--cc=devicetree@vger.kernel.org \
--cc=lars@metafoo.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ludovic.desroches@microchip.com \
--cc=nicolas.ferre@microchip.com \
--cc=pmeerw@pmeerw.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).