devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
To: Quentin Schulz
	<quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
Cc: knaack.h-Mmb7MZpHnFY@public.gmane.org,
	lars-Qo5EllUWu/uELgA04lAiVw@public.gmane.org,
	pmeerw-jW+XmwGofnusTnJN9+BGXg@public.gmane.org,
	robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
	mark.rutland-5wv7dgnIgG8@public.gmane.org,
	wens-jdAy2FN1RRM@public.gmane.org,
	sre-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
	linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org,
	maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org,
	lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org,
	linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org,
	linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org,
	julian.calaby-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Subject: Re: [PATCH v3 01/16] iio: adc: axp20x_adc: put ADC rate setting in a per-variant function
Date: Sun, 21 Jan 2018 12:13:19 +0000	[thread overview]
Message-ID: <20180121121319.3322fe96@archlinux> (raw)
In-Reply-To: <9488159b43c4cc8418afa9d1562d972c4631cb02.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>

On Mon, 15 Jan 2018 11:33:35 +0100
Quentin Schulz <quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> wrote:

> To prepare for a new comer that set a different register with different
> values, move rate setting in a function that is specific to each AXP
> variant.
> 
> Signed-off-by: Quentin Schulz <quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
Applied to the togreg branch of iio.git and pushed out as testing.

Thanks,

Jonathan

> ---
>  drivers/iio/adc/axp20x_adc.c | 18 +++++++++++-------
>  1 file changed, 11 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/iio/adc/axp20x_adc.c b/drivers/iio/adc/axp20x_adc.c
> index a30a972..3fc1b06 100644
> --- a/drivers/iio/adc/axp20x_adc.c
> +++ b/drivers/iio/adc/axp20x_adc.c
> @@ -470,14 +470,18 @@ static const struct iio_info axp22x_adc_iio_info = {
>  	.read_raw = axp22x_read_raw,
>  };
>  
> -static int axp20x_adc_rate(int rate)
> +static int axp20x_adc_rate(struct axp20x_adc_iio *info, int rate)
>  {
> -	return AXP20X_ADC_RATE_HZ(rate);
> +	return regmap_update_bits(info->regmap, AXP20X_ADC_RATE,
> +				  AXP20X_ADC_RATE_MASK,
> +				  AXP20X_ADC_RATE_HZ(rate));
>  }
>  
> -static int axp22x_adc_rate(int rate)
> +static int axp22x_adc_rate(struct axp20x_adc_iio *info, int rate)
>  {
> -	return AXP22X_ADC_RATE_HZ(rate);
> +	return regmap_update_bits(info->regmap, AXP20X_ADC_RATE,
> +				  AXP20X_ADC_RATE_MASK,
> +				  AXP22X_ADC_RATE_HZ(rate));
>  }
>  
>  struct axp_data {
> @@ -485,7 +489,8 @@ struct axp_data {
>  	int				num_channels;
>  	struct iio_chan_spec const	*channels;
>  	unsigned long			adc_en1_mask;
> -	int				(*adc_rate)(int rate);
> +	int				(*adc_rate)(struct axp20x_adc_iio *info,
> +						    int rate);
>  	bool				adc_en2;
>  	struct iio_map			*maps;
>  };
> @@ -554,8 +559,7 @@ static int axp20x_probe(struct platform_device *pdev)
>  				   AXP20X_ADC_EN2_MASK, AXP20X_ADC_EN2_MASK);
>  
>  	/* Configure ADCs rate */
> -	regmap_update_bits(info->regmap, AXP20X_ADC_RATE, AXP20X_ADC_RATE_MASK,
> -			   info->data->adc_rate(100));
> +	info->data->adc_rate(info, 100);
>  
>  	ret = iio_map_array_register(indio_dev, info->data->maps);
>  	if (ret < 0) {

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2018-01-21 12:13 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-15 10:33 [PATCH v3 00/16] add support for AXP813 ADC and battery power supply Quentin Schulz
     [not found] ` <cover.2e5329bf5475a5160e613a4eb1e1377c662ce56e.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-15 10:33   ` [PATCH v3 01/16] iio: adc: axp20x_adc: put ADC rate setting in a per-variant function Quentin Schulz
     [not found]     ` <9488159b43c4cc8418afa9d1562d972c4631cb02.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-21 12:13       ` Jonathan Cameron [this message]
2018-01-15 10:33   ` [PATCH v3 02/16] dt-bindings: iio: adc: add binding for X-Powers AXP PMICs ADC Quentin Schulz
2018-01-21 12:18     ` Jonathan Cameron
2018-01-15 10:33   ` [PATCH v3 03/16] iio: adc: axp20x_adc: make it possible to probe from DT Quentin Schulz
2018-01-21 12:22     ` Jonathan Cameron
2018-01-15 10:33   ` [PATCH v3 04/16] ARM: dtsi: axp209: add node for ADC Quentin Schulz
     [not found]     ` <ea299dca30bb3d0413d35717522643b5a00e731c.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-23 15:33       ` Chen-Yu Tsai
2018-01-15 10:33   ` [PATCH v3 05/16] ARM: dtsi: axp22x: " Quentin Schulz
     [not found]     ` <c73ef705e9feacde577de66355a2033b419ca004.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-23 15:33       ` Chen-Yu Tsai
2018-01-15 10:33   ` [PATCH v3 06/16] mfd: axp20x: make AXP209/22x cells probe their ADC via DT Quentin Schulz
     [not found]     ` <8901f920fb8d84f8bf0cb2832f560c78bffc0392.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-23  9:54       ` Lee Jones
2018-01-23 15:32         ` Chen-Yu Tsai
2018-01-15 10:33   ` [PATCH v3 07/16] iio: adc: axp20x_adc: add support for AXP813 ADC Quentin Schulz
2018-01-21 12:26     ` Jonathan Cameron
2018-01-22  8:22       ` Quentin Schulz
2018-01-28  8:12         ` Jonathan Cameron
2018-01-15 10:33   ` [PATCH v3 08/16] ARM: dtsi: axp81x: add node for ADC Quentin Schulz
     [not found]     ` <eb8f23f57dc9d7d7c87c5eea2f85e90470e27c83.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-23 15:33       ` Chen-Yu Tsai
2018-01-15 10:33   ` [PATCH v3 09/16] mfd: axp20x: probe axp20x_adc driver for AXP813 Quentin Schulz
     [not found]     ` <d5792ed6e1e989dde3c9ecdd018286109dfc101d.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-23  9:53       ` Lee Jones
2018-01-23 15:32         ` Chen-Yu Tsai
2018-01-15 10:33   ` [PATCH v3 10/16] power: supply: axp20x_battery: use data structure instead of ID for Quentin Schulz
     [not found]     ` <c4129842e1254289ebb3ad1755879a3722bac1cf.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-23 15:39       ` Chen-Yu Tsai
2018-01-15 10:33   ` [PATCH v3 11/16] dt-bindings: power: supply: axp20x: add AXP813 battery DT binding Quentin Schulz
     [not found]     ` <7b53727c33207f4b7ae36218c99abfb86876e716.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-23 15:43       ` Chen-Yu Tsai
2018-01-15 10:33   ` [PATCH v3 12/16] power: supply: axp20x_battery: add support for AXP813 Quentin Schulz
     [not found]     ` <42b2e555083abbab43e48362175dc9c2eeeedf3c.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-23 15:47       ` Chen-Yu Tsai
2018-01-15 10:33   ` [PATCH v3 13/16] mfd: axp20x: add battery power supply cell " Quentin Schulz
     [not found]     ` <76855b0d3b9eb75e00eb6a058db5b4a33b0558c6.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-23 15:50       ` Chen-Yu Tsai
2018-01-15 10:33   ` [PATCH v3 14/16] ARM: dtsi: axp81x: add battery power supply subnode Quentin Schulz
     [not found]     ` <9c045de8dcee9a71803978855762e272efdc41d3.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-23 15:50       ` Chen-Yu Tsai
2018-01-15 10:33   ` [PATCH v3 15/16] ARM: dtsi: sun8i: a711: enable " Quentin Schulz
2018-01-23 15:51     ` [linux-sunxi] " Chen-Yu Tsai
2018-01-15 10:33   ` [PATCH v3 16/16] ARM: dtsi: axp81x: remove IP name from DT node name Quentin Schulz
     [not found]     ` <6e881951c43b8829cd509c3db06fa5520f71e779.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-23 15:51       ` Chen-Yu Tsai
2018-01-23 15:55 ` [PATCH v3 00/16] add support for AXP813 ADC and battery power supply Chen-Yu Tsai

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=20180121121319.3322fe96@archlinux \
    --to=jic23-dgejt+ai2ygdnm+yrofe0a@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=julian.calaby-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
    --cc=knaack.h-Mmb7MZpHnFY@public.gmane.org \
    --cc=lars-Qo5EllUWu/uELgA04lAiVw@public.gmane.org \
    --cc=lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
    --cc=linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org \
    --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org \
    --cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \
    --cc=maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \
    --cc=pmeerw-jW+XmwGofnusTnJN9+BGXg@public.gmane.org \
    --cc=quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \
    --cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
    --cc=sre-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
    --cc=thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \
    --cc=wens-jdAy2FN1RRM@public.gmane.org \
    /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).