From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To: Samuel Ortiz <sameo@linux.intel.com>
Cc: "Benoît Cousson" <b-cousson@ti.com>,
"Tony Lindgren" <tony@atomide.com>,
"Jonathan Cameron" <jic23@cam.ac.uk>,
"Dmitry Torokhov" <dmitry.torokhov@gmail.com>,
"Felipe Balbi" <balbi@ti.com>,
linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org,
linux-iio@vger.kernel.org, linux-input@vger.kernel.org,
"Pantelis Antoniou" <panto@antoniou-consulting.com>,
"Sebastian Andrzej Siewior" <bigeasy@linutronix.de>
Subject: [PATCH 11/21] iio: ti_tscadc: provide datasheet_name and scan_type
Date: Wed, 12 Jun 2013 18:58:12 +0200 [thread overview]
Message-ID: <1371056302-12714-12-git-send-email-bigeasy@linutronix.de> (raw)
In-Reply-To: <1371056302-12714-1-git-send-email-bigeasy@linutronix.de>
From: Pantelis Antoniou <panto@antoniou-consulting.com>
This patch provides the members "datasheet_name" and scan_type. This is
the remaining part of the earlier patch where I (bigeasy) removed iio_map
because it is now supplied by the device tree. It also static names as
suggested by Jonathan.
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
drivers/iio/adc/ti_am335x_adc.c | 29 ++++++++++++++++++++++++-----
1 file changed, 24 insertions(+), 5 deletions(-)
diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index 2868c0c..9939810 100644
--- a/drivers/iio/adc/ti_am335x_adc.c
+++ b/drivers/iio/adc/ti_am335x_adc.c
@@ -24,6 +24,8 @@
#include <linux/iio/iio.h>
#include <linux/of.h>
#include <linux/of_device.h>
+#include <linux/iio/machine.h>
+#include <linux/iio/driver.h>
#include <linux/mfd/ti_am335x_tscadc.h>
@@ -84,29 +86,46 @@ static void tiadc_step_config(struct tiadc_device *adc_dev)
am335x_tsc_se_set(adc_dev->mfd_tscadc, step_en);
}
+static const char * const chan_name_ain[] = {
+ "AIN0",
+ "AIN1",
+ "AIN2",
+ "AIN3",
+ "AIN4",
+ "AIN5",
+ "AIN6",
+ "AIN7",
+};
+
static int tiadc_channel_init(struct iio_dev *indio_dev, int channels)
{
+ struct tiadc_device *adc_dev = iio_priv(indio_dev);
struct iio_chan_spec *chan_array;
+ struct iio_chan_spec *chan;
int i;
indio_dev->num_channels = channels;
- chan_array = kcalloc(indio_dev->num_channels,
+ chan_array = kcalloc(channels,
sizeof(struct iio_chan_spec), GFP_KERNEL);
-
if (chan_array == NULL)
return -ENOMEM;
- for (i = 0; i < (indio_dev->num_channels); i++) {
- struct iio_chan_spec *chan = chan_array + i;
+ chan = chan_array;
+ for (i = 0; i < channels; i++, chan++) {
+
chan->type = IIO_VOLTAGE;
chan->indexed = 1;
chan->channel = i;
chan->info_mask_separate = BIT(IIO_CHAN_INFO_RAW);
+ chan->datasheet_name = chan_name_ain[i];
+ chan->scan_type.sign = 'u';
+ chan->scan_type.realbits = 12;
+ chan->scan_type.storagebits = 32;
}
indio_dev->channels = chan_array;
- return indio_dev->num_channels;
+ return 0;
}
static void tiadc_channels_remove(struct iio_dev *indio_dev)
--
1.7.10.4
next prev parent reply other threads:[~2013-06-12 16:58 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-12 16:58 am335x: TSC & ADC reworking including DT pieces, take 5 Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 01/21] mfd: input: iio: ti_am335x_adc: use one structure for ti_tscadc_dev Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 02/21] input: ti_am33x_tsc: Step enable bits made configurable Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 03/21] input: ti_am33x_tsc: Order of TSC wires, " Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 04/21] input: ti_am33x_tsc: remove unwanted fifo flush Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 05/21] input: ti_am33x_tsc: Add DT support Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 06/21] input: ti_am33x_tsc: remove platform_data support Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 07/21] iio: ti_am335x_adc: Add DT support Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 08/21] iio: ti_am335x_adc: remove platform_data support Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 09/21] mfd: ti_am335x_tscadc: Add DT support Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 10/21] mfd: ti_am335x_tscadc: remove platform_data support Sebastian Andrzej Siewior
2013-06-12 16:58 ` Sebastian Andrzej Siewior [this message]
2013-06-12 16:58 ` [PATCH 12/21] mfd: ti_tscadc: deal with partial activation Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 13/21] arm: am33xx: add TSC/ADC mfd device support Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 14/21] input: mfd: ti_am335x_tsc remove remaining platform data pieces Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 15/21] mfd: input: ti_am335x_tsc: rename device from tsc to TI-am335x-tsc Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 16/21] mfd: iio: ti_am335x_adc: rename device from tiadc to TI-am335x-adc Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 17/21] input: ti_am335x_adc: use only FIFO0 and clean up a little Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 18/21] input: ti_am335x_tsc: ACK the HW_PEN irq in ISR Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 19/21] input: ti_am335x_tsc: return IRQ_NONE if there was no IRQ for us Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 20/21] iio: ti_am335x_adc: Allow to specify input line Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 21/21] iio: ti_am335x_adc: check if we found the value Sebastian Andrzej Siewior
[not found] ` <1371056302-12714-1-git-send-email-bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-13 9:07 ` am335x: TSC & ADC reworking including DT pieces, take 5 Samuel Ortiz
2013-06-13 9:25 ` Sebastian Andrzej Siewior
[not found] ` <51B99006.2060103-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-13 9:37 ` Samuel Ortiz
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=1371056302-12714-12-git-send-email-bigeasy@linutronix.de \
--to=bigeasy@linutronix.de \
--cc=b-cousson@ti.com \
--cc=balbi@ti.com \
--cc=dmitry.torokhov@gmail.com \
--cc=jic23@cam.ac.uk \
--cc=linux-iio@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=panto@antoniou-consulting.com \
--cc=sameo@linux.intel.com \
--cc=tony@atomide.com \
/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).