linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
To: Sebastian Andrzej Siewior
	<bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
Cc: Samuel Ortiz <sameo-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>,
	Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>,
	linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Dmitry Torokhov
	<dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
	Jonathan Cameron <jic23-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org>
Subject: Re: [PATCH 21/22] iio/ti_am335x_adc: Allow to specify input line
Date: Sat, 08 Jun 2013 10:24:46 +0100	[thread overview]
Message-ID: <51B2F85E.2080805@kernel.org> (raw)
In-Reply-To: <1370449495-29981-22-git-send-email-bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>

On 06/05/2013 05:24 PM, Sebastian Andrzej Siewior wrote:
> The TSC part allows to specify the input lines. The IIO part assumes
> that it usues always the last few, that means if IIO has adc-channels
> set to 2 it will use channel 6 and 7. However it might make sense to use
> only 6.
> This patch changes the device property (which was introduced recently
> and was never in an official release) in a way that the user can specify
> which of the AIN lines should be used. In Addition to this, the name is
> now AINx where x is the channel number i.e. for AIN6 we would have 6.
> Prior this, it always started counting at 0 which is confusing. In
> addition to this, it also checks for correct step number during reading
> and does not rely on proper FIFO depth.
>
Looks like a typo below... Also the change that is in doesn't directly seem
to be described in this description.

> Acked-by: Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
> ---
>  arch/arm/boot/dts/am335x-evm.dts |    2 +-
>  drivers/iio/adc/ti_am335x_adc.c  |   59 +++++++++++++++++++++++++-------------
>  drivers/mfd/ti_am335x_tscadc.c   |   20 +++++++++++--
>  3 files changed, 58 insertions(+), 23 deletions(-)
>
> diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
> index 26fea97..0fa4c7f 100644
> --- a/arch/arm/boot/dts/am335x-evm.dts
> +++ b/arch/arm/boot/dts/am335x-evm.dts
> @@ -255,6 +255,6 @@
>  	};
>
>  	adc {
> -		ti,adc-channels = <4>;
> +		ti,adc-channels = <4 5 6 7>;
>  	};
>  };
> diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
> index 031f8e5..4bf34f2 100644
> --- a/drivers/iio/adc/ti_am335x_adc.c
> +++ b/drivers/iio/adc/ti_am335x_adc.c
> @@ -32,6 +32,8 @@
>  struct tiadc_device {
>  	struct ti_tscadc_dev *mfd_tscadc;
>  	int channels;
> +	u8 channel_line[8];
> +	u8 channel_step[8];
>  	struct iio_map *map;
>  };
>
> @@ -58,7 +60,7 @@ static u32 get_adc_step_mask(struct tiadc_device *adc_dev)
>  static void tiadc_step_config(struct tiadc_device *adc_dev)
>  {
>  	unsigned int stepconfig;
> -	int i, channels = 0, steps;
> +	int i, steps;
>  	u32 step_en;
>
>  	/*
> @@ -72,16 +74,18 @@ static void tiadc_step_config(struct tiadc_device *adc_dev)
>  	 */
>
>  	steps = TOTAL_STEPS - adc_dev->channels;
> -	channels = TOTAL_CHANNELS - adc_dev->channels;
> -
>  	stepconfig = STEPCONFIG_AVG_16 | STEPCONFIG_FIFO1;
>
> -	for (i = steps; i < TOTAL_STEPS; i++) {
> -		tiadc_writel(adc_dev, REG_STEPCONFIG(i),
> -				stepconfig | STEPCONFIG_INP(channels));
> -		tiadc_writel(adc_dev, REG_STEPDELAY(i),
> +	for (i = 0; i < adc_dev->channels; i++) {
> +		int chan;
> +
> +		chan = adc_dev->channel_line[i];
> +		tiadc_writel(adc_dev, REG_STEPCONFIG(steps),
> +				stepconfig | STEPCONFIG_INP(chan));
> +		tiadc_writel(adc_dev, REG_STEPDELAY(steps),
>  				STEPCONFIG_OPENDLY);
> -		channels++;
> +		adc_dev->channel_step[i] = steps;
> +		steps++;
>  	}
>  	step_en = get_adc_step_mask(adc_dev);
>  	am335x_tsc_se_set(adc_dev->mfd_tscadc, step_en);
> @@ -116,9 +120,9 @@ static int tiadc_channel_init(struct iio_dev *indio_dev, int channels)
>
>  		chan->type = IIO_VOLTAGE;
>  		chan->indexed = 1;
> -		chan->channel = i;
> +		chan->channel = adc_dev->channel_line[i];
>  		chan->info_mask_separate = BIT(IIO_CHAN_INFO_RAW);
> -		chan->datasheet_name = chan_name_ain[i];
> +		chan->datasheet_name = chan_name_ain[chan->channel];
>  		chan->scan_type.sign = 'u';
>  		chan->scan_type.realbits = 12;
>  		chan->scan_type.storagebits = 32;
> @@ -165,7 +169,8 @@ static int tiadc_read_raw(struct iio_dev *indio_dev,
>  {
>  	struct tiadc_device *adc_dev = iio_priv(indio_dev);
>  	int i;
> -	unsigned int fifo1count, readx1;
> +	unsigned int fifo1count, read;
> +	u32 step = UINT_MAX;
>
>  	/*
>  	 * When the sub-system is first enabled,
> @@ -178,11 +183,20 @@ static int tiadc_read_raw(struct iio_dev *indio_dev,
>  	 * Hence we need to flush out this data.
>  	 */
>
> +	for (i = 0; i < ARRAY_SIZE(adc_dev->channel_step); i++) {
> +		if (chan->channel == adc_dev->channel_line[i]) {
> +			step = adc_dev->channel_step[i];
> +			break;
> +		}
> +	}
> +	if (WARN_ON_ONCE(step == UINT_MAX))
> +		return -EINVAL;
> +
>  	fifo1count = tiadc_readl(adc_dev, REG_FIFO1CNT);
>  	for (i = 0; i < fifo1count; i++) {
> -		readx1 = tiadc_readl(adc_dev, REG_FIFO1);
> -		if (i == chan->channel)
> -			*val = readx1 & 0xfff;
> +		read = tiadc_readl(adc_dev, REG_FIFO1);
> +		if (read >> 16 == step)
> +			*val = read & 0xfff;
>  	}
>  	am335x_tsc_se_update(adc_dev->mfd_tscadc);
>
> @@ -199,8 +213,11 @@ static int tiadc_probe(struct platform_device *pdev)
>  	struct tiadc_device	*adc_dev;
>  	struct ti_tscadc_dev	*tscadc_dev = ti_tscadc_dev_get(pdev);
>  	struct device_node	*node = tscadc_dev->dev->of_node;
> +	struct property		*prop;
> +	const __be32		*cur;
>  	int			err;
> -	u32			val32;
> +	u32			val;
> +	int channels		= 0;
>
>  	if (!node) {
>  		dev_err(&pdev->dev, "Could not find valid DT data.\n");
> @@ -222,11 +239,13 @@ static int tiadc_probe(struct platform_device *pdev)
>  		err = -EINVAL;
>  		goto err_free_device;
>  	}
> -	err = of_property_read_u32(node,
> -			"ti,adc-channels", &val32);
> -	if (err < 0)
> -		goto err_free_device;
> -	adc_dev->channels = val32;
> +
> +	of_property_for_each_u32(node, "ti,adc-channels", prop, cur, val) {
> +
> +		adc_dev->channel_line[channels] = val;
> +		channels++;
> +	}
> +	adc_dev->channels = channels;
>
>  	indio_dev->dev.parent = &pdev->dev;
>  	indio_dev->name = dev_name(&pdev->dev);
> diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
> index 8bdab8d..acdb7b9 100644
> --- a/drivers/mfd/ti_am335x_tscadc.c
> +++ b/drivers/mfd/ti_am335x_tscadc.c
> @@ -80,9 +80,13 @@ static	int ti_tscadc_probe(struct platform_device *pdev)
>  	struct clk		*clk;
>  	struct device_node	*node = pdev->dev.of_node;
>  	struct mfd_cell		*cell;
> +	struct property         *prop;
> +	const __be32            *cur;
> +	u32			val;
>  	int			err, ctrl;
>  	int			clk_value, clock_rate;
>  	int			tsc_wires = 0, adc_channels = 0, total_channels;
> +	int			readouts = 0;
>
>  	if (!pdev->dev.of_node) {
>  		dev_err(&pdev->dev, "Could not find valid DT data.\n");
> @@ -91,10 +95,17 @@ static	int ti_tscadc_probe(struct platform_device *pdev)
>
>  	node = of_get_child_by_name(pdev->dev.of_node, "tsc");
>  	of_property_read_u32(node, "ti,wires", &tsc_wires);
> +	of_property_read_u32(node, "ti,coordiante-readouts", &readouts);
Coordiante? I'm guessing coordinate
>
>  	node = of_get_child_by_name(pdev->dev.of_node, "adc");
> -	of_property_read_u32(node, "ti,adc-channels", &adc_channels);
> -
> +	of_property_for_each_u32(node, "ti,adc-channels", prop, cur, val) {
> +		adc_channels++;
> +		if (val > 7) {
> +			dev_err(&pdev->dev, " PIN numbers are 0..7 (not %d)\n",
> +					val);
> +			return -EINVAL;
> +		}
> +	}
>  	total_channels = tsc_wires + adc_channels;
>  	if (total_channels > 8) {
>  		dev_err(&pdev->dev, "Number of i/p channels more than 8\n");
> @@ -105,6 +116,11 @@ static	int ti_tscadc_probe(struct platform_device *pdev)
>  		return -EINVAL;
>  	}
>
> +	if (readouts * 2 + 2 + adc_channels > 16) {
> +		dev_err(&pdev->dev, "Too many step configurations requested\n");
> +		return -EINVAL;
> +	}
> +
>  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>  	if (!res) {
>  		dev_err(&pdev->dev, "no memory resource defined.\n");
>

  parent reply	other threads:[~2013-06-08  9:24 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-05 16:24 AM335x tsc & adc, dt + cleanup take 3 Sebastian Andrzej Siewior
2013-06-05 16:24 ` [PATCH 03/22] input/ti_am33x_tsc: Step enable bits made configurable Sebastian Andrzej Siewior
2013-06-05 16:24 ` [PATCH 05/22] input/ti_am33x_tsc: remove unwanted fifo flush Sebastian Andrzej Siewior
2013-06-05 16:24 ` [PATCH 09/22] iio/ti_am335x_adc: remove platform_data support Sebastian Andrzej Siewior
2013-06-05 16:24 ` [PATCH 10/22] mfd/ti_am335x_tscadc: Add DT support Sebastian Andrzej Siewior
2013-06-05 16:24 ` [PATCH 11/22] mfd/ti_am335x_tscadc: remove platform_data support Sebastian Andrzej Siewior
2013-06-05 16:24 ` [PATCH 12/22] iio/ti_tscadc: Update with IIO map interface Sebastian Andrzej Siewior
     [not found]   ` <1370449495-29981-13-git-send-email-bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-08  9:18     ` Jonathan Cameron
2013-06-09 16:41     ` Lars-Peter Clausen
2013-06-10  7:40       ` Sebastian Andrzej Siewior
     [not found]         ` <51B582D3.1050501-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-10  8:10           ` Pantelis Antoniou
2013-06-10  8:32             ` Lars-Peter Clausen
     [not found]               ` <51B58F39.7020405-Qo5EllUWu/uELgA04lAiVw@public.gmane.org>
2013-06-10  8:33                 ` Pantelis Antoniou
2013-06-10  8:38           ` Lars-Peter Clausen
     [not found]             ` <51B59071.9090908-Qo5EllUWu/uELgA04lAiVw@public.gmane.org>
2013-06-10  9:15               ` Sebastian Andrzej Siewior
2013-06-10 16:27             ` Sebastian Andrzej Siewior
2013-06-05 16:24 ` [PATCH 13/22] mfd/ti_tscadc: deal with partial activation Sebastian Andrzej Siewior
2013-06-05 16:24 ` [PATCH 15/22] input & mfd: ti_am335x_tsc remove remaining platform data pieces Sebastian Andrzej Siewior
     [not found] ` <1370449495-29981-1-git-send-email-bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-05 16:24   ` [PATCH 01/22] mfd/ti_am335x_tscadc: remove regmap Sebastian Andrzej Siewior
2013-06-05 16:24   ` [PATCH 02/22] mfd & input & iio/ti_am335x_adc: use one structure for ti_tscadc_dev Sebastian Andrzej Siewior
2013-06-05 16:24   ` [PATCH 04/22] input/ti_am33x_tsc: Order of TSC wires, made configurable Sebastian Andrzej Siewior
2013-06-05 16:24   ` [PATCH 06/22] input/ti_am33x_tsc: Add DT support Sebastian Andrzej Siewior
2013-06-05 16:24   ` [PATCH 07/22] input/ti_am33x_tsc: remove platform_data support Sebastian Andrzej Siewior
2013-06-05 16:24   ` [PATCH 08/22] iio/ti_am335x_adc: Add DT support Sebastian Andrzej Siewior
2013-06-05 16:24   ` [PATCH 14/22] arm/am33xx: add TSC/ADC mfd device support Sebastian Andrzej Siewior
2013-06-05 16:24   ` [PATCH 16/22] mfd & input/ti_am335x_tsc: rename device from tsc to TI-am335x-tsc Sebastian Andrzej Siewior
2013-06-05 16:24   ` [PATCH 17/22] mfd & iio/ti_am335x_adc: rename device from tiadc to TI-am335x-adc Sebastian Andrzej Siewior
     [not found]     ` <1370449495-29981-18-git-send-email-bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-08  9:19       ` Jonathan Cameron
2013-06-05 16:24   ` [PATCH 18/22] input/ti_am335x_adc: use only FIFO0 and clean up a little Sebastian Andrzej Siewior
2013-06-05 16:24   ` [PATCH 19/22] input/ti_am335x_tsc: ACK the HW_PEN irq in ISR Sebastian Andrzej Siewior
2013-06-05 16:24   ` [PATCH 20/22] input/ti_am335x_tsc: return IRQ_NONE if there was no IRQ for us Sebastian Andrzej Siewior
2013-06-05 16:24   ` [PATCH 21/22] iio/ti_am335x_adc: Allow to specify input line Sebastian Andrzej Siewior
     [not found]     ` <1370449495-29981-22-git-send-email-bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-08  9:24       ` Jonathan Cameron [this message]
     [not found]         ` <51B2F85E.2080805-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-06-10  7:32           ` Sebastian Andrzej Siewior
2013-06-09 16:52       ` Lars-Peter Clausen
     [not found]         ` <51B4B2CE.3020300-Qo5EllUWu/uELgA04lAiVw@public.gmane.org>
2013-06-11  7:55           ` Sebastian Andrzej Siewior
2013-06-05 16:24 ` [PATCH 22/22] iio/ti_am335x_adc: check if we found the value Sebastian Andrzej Siewior
  -- strict thread matches above, loose matches on Subject: below --
2013-06-11 11:30 am335x: TSC & ADC reworking including DT pieces, take 4 Sebastian Andrzej Siewior
2013-06-11 11:31 ` [PATCH 21/22] iio/ti_am335x_adc: Allow to specify input line Sebastian Andrzej Siewior

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=51B2F85E.2080805@kernel.org \
    --to=jic23-dgejt+ai2ygdnm+yrofe0a@public.gmane.org \
    --cc=balbi-l0cyMroinI0@public.gmane.org \
    --cc=bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org \
    --cc=dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
    --cc=jic23-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org \
    --cc=linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=sameo-VuQAYsv1563Yd54FQh9/CA@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).