[PATCH 2/6] ARM: AT91: IIO: Add AT91 ADC driver.
Jonathan Cameron
jic23 at kernel.org
Wed Apr 18 13:52:33 EDT 2012
On 04/18/2012 02:33 PM, Maxime Ripard wrote:
> Add the IIO driver for the AT91 ADCs. It only supports and has
> been tested on the SAM9G20 evaluation boards, but support for
> other boards will come eventually.
>
> This ADC is a multi-channel ADC with support for both hardware
> and software triggers.
>
> This first version only supports software triggers.
>
Basically looks fine. I think there are a few places where
devm stuff could be used but I don't really care.
Other than that, there is a series winging its way to Greg
that changes the abi. The fixups that will be needed to work
with that are inline below. Shouldn't cause compile issues
but will break the driver..
> Signed-off-by: Maxime Ripard <maxime.ripard at free-electrons.com>
Acked-by: Jonathan Cameron <jic23 at kernel.org>
>
> Cc: Nicolas Ferre <nicolas.ferre at atmel.com>
> Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
> Cc: Patrice Vilchez <patrice.vilchez at atmel.com>
> Cc: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
> Cc: Jonathan Cameron <jic23 at cam.ac.uk>
> ---
> drivers/staging/iio/adc/Kconfig | 6 +
> drivers/staging/iio/adc/Makefile | 1 +
> drivers/staging/iio/adc/at91_adc.c | 396 ++++++++++++++++++++++++++++++++++++
> 3 files changed, 403 insertions(+), 0 deletions(-)
> create mode 100644 drivers/staging/iio/adc/at91_adc.c
>
> diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
> index 592eabd..1494838 100644
> --- a/drivers/staging/iio/adc/Kconfig
> +++ b/drivers/staging/iio/adc/Kconfig
> @@ -169,6 +169,12 @@ config AD7280
> To compile this driver as a module, choose M here: the
> module will be called ad7280a
>
> +config AT91_ADC
> + tristate "Atmel AT91 ADC"
> + depends on SYSFS && ARCH_AT91
> + help
> + Say yes here to build support for Atmel AT91 ADC.
> +
> config MAX1363
> tristate "Maxim max1363 ADC driver"
> depends on I2C
> diff --git a/drivers/staging/iio/adc/Makefile b/drivers/staging/iio/adc/Makefile
> index f83ab95..8cb6d1c 100644
> --- a/drivers/staging/iio/adc/Makefile
> +++ b/drivers/staging/iio/adc/Makefile
> @@ -38,3 +38,4 @@ obj-$(CONFIG_ADT7310) += adt7310.o
> obj-$(CONFIG_ADT7410) += adt7410.o
> obj-$(CONFIG_AD7280) += ad7280a.o
> obj-$(CONFIG_LPC32XX_ADC) += lpc32xx_adc.o
> +obj-$(CONFIG_AT91_ADC) += at91_adc.o
Ideally pretend those files were in alphabetical order and slot in where
ever will cause
the smallest possible patch to fix the rest of the file ;)
> diff --git a/drivers/staging/iio/adc/at91_adc.c b/drivers/staging/iio/adc/at91_adc.c
> new file mode 100644
> index 0000000..6d14277
> --- /dev/null
> +++ b/drivers/staging/iio/adc/at91_adc.c
> @@ -0,0 +1,396 @@
> +/*
> + * Driver for the ADC present in the Atmel AT91 evaluation boards.
> + *
> + * Copyright 2011 Free Electrons
> + *
> + * Licensed under the GPLv2 or later.
> + */
> +
> +#include <linux/bitmap.h>
> +#include <linux/bitops.h>
> +#include <linux/clk.h>
> +#include <linux/err.h>
> +#include <linux/io.h>
> +#include <linux/interrupt.h>
> +#include <linux/jiffies.h>
> +#include <linux/kernel.h>
> +#include <linux/module.h>
> +#include <linux/platform_device.h>
> +#include <linux/sched.h>
> +#include <linux/slab.h>
> +#include <linux/wait.h>
> +
> +#include "../iio.h"
> +#include <linux/platform_data/at91_adc.h>
> +
> +#include <mach/at91_adc.h>
> +#include <mach/cpu.h>
> +
> +/**
> + * struct at91_adc_desc - description of the ADC on the board
> + * @clock: ADC clock as specified by the datasheet, in Hz.
> + * @num_channels: global number of channels available on the board (to
> + specify which channels are indeed in use on the
> + board, see the channels_used bitmask in the platform
> + data)
> + * @startup_time: startup time of the ADC in microseconds
> + */
> +struct at91_adc_desc {
> + u32 clock;
> + u8 num_channels;
> + u8 startup_time;
> +};
> +
> +struct at91_adc_state {
> + unsigned long channels_mask;
> + struct clk *clk;
> + bool done;
> + struct at91_adc_desc *desc;
> + int irq;
> + u16 last_value;
> + struct mutex lock;
> + void __iomem *reg_base;
> + u32 vref_mv;
> + wait_queue_head_t wq_data_avail;
> +};
> +
> +static struct at91_adc_desc at91_adc_desc_sam9g20 = {
> + .clock = 5000000,
> + .clock_name = "adc_clk",
> + .num_channels = 4,
> + .startup_time = 10,
> +};
> +
> +static int at91_adc_select_soc(struct at91_adc_state *st)
> +{
> + if (cpu_is_at91sam9g20()) {
> + st->desc = &at91_adc_desc_sam9g20;
> + return 0;
> + }
> +
> + return -ENODEV;
> +}
> +
> +static inline u32 at91_adc_reg_read(struct at91_adc_state *st,
> + u8 reg)
> +{
> + return readl_relaxed(st->reg_base + reg);
> +}
> +
> +static inline void at91_adc_reg_write(struct at91_adc_state *st,
> + u8 reg,
> + u32 val)
> +{
> + writel_relaxed(val, st->reg_base + reg);
> +}
> +
> +static irqreturn_t at91_adc_eoc_trigger(int irq, void *private)
> +{
> + struct iio_dev *idev = private;
> + struct at91_adc_state *st = iio_priv(idev);
> + unsigned int status = at91_adc_reg_read(st, AT91_ADC_SR);
> +
> + if (!(status & AT91_ADC_DRDY))
> + return IRQ_HANDLED;
> +
> + if (status & st->channels_mask) {
> + st->done = true;
> + st->last_value = at91_adc_reg_read(st, AT91_ADC_LCDR);
> + }
> +
> + wake_up_interruptible(&st->wq_data_avail);
> +
> + return IRQ_HANDLED;
> +}
> +
> +static int at91_adc_channel_init(struct iio_dev *idev,
> + struct at91_adc_data *pdata)
> +{
> + struct at91_adc_state *st = iio_priv(idev);
> + struct iio_chan_spec *chan_array;
> + int bit, idx = 0;
> +
> + idev->num_channels = bitmap_weight(&pdata->channels_used,
> + st->desc->num_channels);
> +
> + chan_array = devm_kzalloc(&idev->dev,
> + idev->num_channels * sizeof(struct iio_chan_spec),
> + GFP_KERNEL);
> +
> + if (chan_array == NULL)
> + return -ENOMEM;
> +
> + for_each_set_bit(bit, &pdata->channels_used, st->desc->num_channels) {
> + struct iio_chan_spec *chan = chan_array + idx;
> + chan->type = IIO_VOLTAGE;
> + chan->indexed = 1;
> + chan->channel = bit;
> + chan->scan_type.sign = 'u';
> + chan->scan_type.realbits = 10;
> + chan->scan_type.storagebits = 16;
> + chan->info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT;
Unfortunately you have probably (unless Greg doesn't merge it)
crossed with a series that means you'll need to add
IIO_CHAN_INFO_RAW_SEPARATE_BIT to the chan->info_mask or
no raw reading attributes will get registered.
Sorry, we had reason to make this optional and obviously
the patch only drove it into drivers that were in tree.
> + idx++;
> + }
> +
> + idev->channels = chan_array;
> + return idev->num_channels;
> +}
> +
> +static void at91_adc_channel_remove(struct iio_dev *idev)
> +{
> + devm_kfree(&idev->dev, (void*)idev->channels);
> +}
> +
> +static int at91_adc_read_raw(struct iio_dev *idev,
> + struct iio_chan_spec const *chan,
> + int *val, int *val2, long mask)
> +{
> + struct at91_adc_state *st = iio_priv(idev);
> + int ret;
> +
> + switch (mask) {
> + case 0:
The patch mentioned above that is winging it's way to Greg
also gives you IIO_CHAN_INFO_RAW which is cleaner than case 0:
> + mutex_lock(&st->lock);
> +
> + at91_adc_reg_write(st, AT91_ADC_CHER,
> + AT91_ADC_CH(chan->channel));
> + at91_adc_reg_write(st, AT91_ADC_IER,
> + AT91_ADC_EOC(chan->channel));
> + at91_adc_reg_write(st, AT91_ADC_CR, AT91_ADC_START);
> +
> + ret = wait_event_interruptible_timeout(st->wq_data_avail,
> + st->done,
> + msecs_to_jiffies(1000));
> + if (ret == 0)
> + return -ETIMEDOUT;
> + else if (ret < 0)
> + return ret;
> +
> + *val = st->last_value;
> +
> + at91_adc_reg_write(st, AT91_ADC_CHDR,
> + AT91_ADC_CH(chan->channel));
> + at91_adc_reg_write(st, AT91_ADC_IDR,
> + AT91_ADC_EOC(chan->channel));
> +
> + st->last_value = 0;
> + st->done = false;
> + mutex_unlock(&st->lock);
> + return IIO_VAL_INT;
> +
> + case IIO_CHAN_INFO_SCALE:
> + *val = (st->vref_mv * 1000) >> chan->scan_type.realbits;
> + *val2 = 0;
> + return IIO_VAL_INT_PLUS_MICRO;
> + default:
> + break;
> + }
> + return -EINVAL;
> +}
> +
> +static const struct iio_info at91_adc_info = {
> + .driver_module = THIS_MODULE,
> + .read_raw = &at91_adc_read_raw,
> +};
> +
> +static int __devinit at91_adc_probe(struct platform_device *pdev)
> +{
> + unsigned int prsc, mstrclk, ticks;
> + int ret;
> + struct iio_dev *idev;
> + struct at91_adc_state *st;
> + struct resource *res;
> + struct at91_adc_data *pdata = pdev->dev.platform_data;
> +
> + if (!pdata) {
> + dev_err(&pdev->dev, "No platform data available.\n");
> + ret = -EINVAL;
> + goto error_ret;
> + }
> +
> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + if (!res) {
> + dev_err(&pdev->dev, "No resource defined\n");
> + ret = -ENXIO;
> + goto error_ret;
> + }
> +
> + idev = iio_allocate_device(sizeof(struct at91_adc_state));
> + if (idev == NULL) {
> + ret = -ENOMEM;
> + goto error_ret;
> + }
> +
> + platform_set_drvdata(pdev, idev);
> +
> + idev->dev.parent = &pdev->dev;
> + idev->name = dev_name(&pdev->dev);
> + idev->modes = INDIO_DIRECT_MODE;
> + idev->info = &at91_adc_info;
> +
> + st = iio_priv(idev);
> + ret = at91_adc_select_soc(st);
> + if (ret) {
> + dev_err(&pdev->dev, "SoC unknown\n");
> + goto error_free_device;
> + }
> +
> + st->irq = platform_get_irq(pdev, 0);
> + if (st->irq < 0) {
> + dev_err(&pdev->dev, "No IRQ ID is designated\n");
> + ret = -ENODEV;
> + goto error_free_device;
> + }
> +
> + if (!request_mem_region(res->start, resource_size(res),
> + "AT91 adc registers")) {
> + dev_err(&pdev->dev, "Resources are unavailable.\n");
> + ret = -EBUSY;
> + goto error_free_device;
> + }
> +
> + st->reg_base = ioremap(res->start, resource_size(res));
> + if (!st->reg_base) {
> + dev_err(&pdev->dev, "Failed to map registers.\n");
> + ret = -ENOMEM;
> + goto error_release_mem;
> + }
> +
> + /*
> + * Disable all IRQs before setting up the handler
> + */
> + at91_adc_reg_write(st, AT91_ADC_CR, AT91_ADC_SWRST);
> + at91_adc_reg_write(st, AT91_ADC_IDR, 0xFFFFFFFF);
> + ret = request_irq(st->irq,
> + at91_adc_eoc_trigger,
> + 0,
> + pdev->dev.driver->name,
> + idev);
> + if (ret) {
> + dev_err(&pdev->dev, "Failed to allocate IRQ.\n");
> + goto error_unmap_reg;
> + }
> +
> + st->clk = clk_get(&pdev->dev, "adc_clk");
> + if (IS_ERR(st->clk)) {
> + dev_err(&pdev->dev, "Failed to get the clock.\n");
> + ret = PTR_ERR(st->clk);
> + goto error_free_irq;
> + }
> +
> + ret = clk_prepare(st->clk);
> + if (ret) {
> + dev_err(&pdev->dev, "Could not prepare the clock.\n");
> + goto error_free_clk;
> + }
> +
> + ret = clk_enable(st->clk);
> + if (ret) {
> + dev_err(&pdev->dev, "Could not enable the clock.\n");
> + goto error_unprepare_clk;
> + }
> +
> + if (!st->desc->clock) {
> + dev_err(&pdev->dev, "No ADCClock available.\n");
> + ret = -EINVAL;
> + goto error_disable_clk;
> + }
> +
> + /*
> + * Prescaler rate computation using the formula from the Atmel's
> + * datasheet : ADC Clock = MCK / ((Prescaler + 1) * 2), ADC Clock being
> + * specified by the electrical characteristics of the board.
> + */
> + mstrclk = clk_get_rate(st->clk);
> + prsc = (mstrclk / (2 * st->desc->clock)) - 1;
> +
> + if (!st->desc->startup_time) {
> + dev_err(&pdev->dev, "No startup time available.\n");
> + ret = -EINVAL;
> + goto error_disable_clk;
> + }
> +
> + /*
> + * Number of ticks needed to cover the startup time of the ADC as
> + * defined in the electrical characteristics of the board, divided by 8.
> + * The formula thus is : Startup Time = (ticks + 1) * 8 / ADC Clock
> + */
> + ticks = round_up((st->desc->startup_time * st->desc->clock /
> + 1000000) - 1, 8) / 8;
> + at91_adc_reg_write(st, AT91_ADC_MR,
> + (AT91_ADC_PRESCAL_(prsc) & AT91_ADC_PRESCAL) |
> + (AT91_ADC_STARTUP_(ticks) & AT91_ADC_STARTUP));
> +
> + /* Setup the ADC channels available on the board */
> + ret = at91_adc_channel_init(idev, pdata);
> + if (ret < 0) {
> + dev_err(&pdev->dev, "Couldn't initialize the channels.\n");
> + goto error_disable_clk;
> + }
> +
> + init_waitqueue_head(&st->wq_data_avail);
> + mutex_init(&st->lock);
> +
> + st->vref_mv = pdata->vref;
> + st->channels_mask = pdata->channels_used;
> +
> + ret = iio_device_register(idev);
> + if (ret < 0) {
> + dev_err(&pdev->dev, "Couldn't register the device.\n");
> + goto error_free_channels;
> + }
> +
> + return 0;
> +
> +error_free_channels:
> + at91_adc_channel_remove(idev);
> +error_disable_clk:
> + clk_disable(st->clk);
> +error_unprepare_clk:
> + clk_unprepare(st->clk);
> +error_free_clk:
> + clk_put(st->clk);
> +error_free_irq:
> + free_irq(st->irq, idev);
> +error_unmap_reg:
> + iounmap(st->reg_base);
> +error_release_mem:
> + release_mem_region(res->start, resource_size(res));
> +error_free_device:
> + iio_free_device(idev);
> +error_ret:
> + return ret;
> +}
> +
> +static int __devexit at91_adc_remove(struct platform_device *pdev)
> +{
> + struct iio_dev *idev = platform_get_drvdata(pdev);
> + struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + struct at91_adc_state *st = iio_priv(idev);
> +
> + iio_device_unregister(idev);
> + at91_adc_channel_remove(idev);
> + clk_disable(st->clk);
> + clk_unprepare(st->clk);
> + clk_put(st->clk);
> + free_irq(st->irq, idev);
> + iounmap(st->reg_base);
> + release_mem_region(res->start, resource_size(res));
> + iio_free_device(idev);
> +
> + return 0;
> +}
> +
> +static struct platform_driver at91_adc_driver = {
> + .probe = at91_adc_probe,
> + .remove = __devexit_p(at91_adc_remove),
> + .driver = {
> + .name = "at91_adc",
> + },
> +};
> +
> +module_platform_driver(at91_adc_driver);
> +
> +MODULE_LICENSE("GPL");
> +MODULE_DESCRIPTION("Atmel AT91 ADC Driver");
> +MODULE_AUTHOR("Maxime Ripard <maxime.ripard at free-electrons.com>");
More information about the linux-arm-kernel
mailing list