Diff
Modified: trunk/drivers/staging/iio/adc/ad7476.h (9385 => 9386)
--- trunk/drivers/staging/iio/adc/ad7476.h 2010-10-24 21:00:50 UTC (rev 9385)
+++ trunk/drivers/staging/iio/adc/ad7476.h 2010-10-24 21:04:58 UTC (rev 9386)
@@ -1,58 +1,69 @@
-#ifndef _AD7476_H_
-#define _AD7476_H_
+/*
+ * AD7476/5/7/8 (A) SPI ADC driver
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+#ifndef IIO_ADC_AD7476_H_
+#define IIO_ADC_AD7476_H_
-struct ad7476_mode {
- const char *name;
- int numvals;
+#define RES_MASK(bits) ((1 << (bits)) - 1)
+
+/*
+ * TODO: struct ad7476_platform_data needs to go into include/linux/iio
+ */
+
+struct ad7476_platform_data {
+ u16 vref_mv;
};
+struct ad7476_chip_info {
+ u8 bits;
+ u8 storagebits;
+ u8 res_shift;
+ char sign;
+ u16 int_vref_mv;
+};
+
struct ad7476_state {
struct iio_dev *indio_dev;
struct spi_device *spi;
- char setupbyte;
- char configbyte;
const struct ad7476_chip_info *chip_info;
- const struct ad7476_mode *current_mode;
+ struct regulator *reg;
struct work_struct poll_work;
atomic_t protect_ring;
- struct iio_trigger *trig;
+ u16 int_vref_mv;
struct spi_transfer xfer;
struct spi_message msg;
- unsigned char data[2];
+ /*
+ * DMA (thus cache coherency maintenance) requires the
+ * transfer buffers to live in their own cache lines.
+ */
+ unsigned char data[2] ____cacheline_aligned;
};
-#define CHIP_NAME "AD7876/7/8"
+enum ad7476_supported_device_ids {
+ ID_AD7466,
+ ID_AD7467,
+ ID_AD7468,
+ ID_AD7475,
+ ID_AD7476,
+ ID_AD7477,
+ ID_AD7478,
+ ID_AD7495
+};
#ifdef CONFIG_IIO_RING_BUFFER
-
-ssize_t ad7476_scan_from_ring(struct device *dev,
- struct device_attribute *attr,
- char *buf);
+int ad7476_scan_from_ring(struct ad7476_state *st);
int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev);
void ad7476_ring_cleanup(struct iio_dev *indio_dev);
-
-int ad7476_initialize_ring(struct iio_ring_buffer *ring);
-void ad7476_uninitialize_ring(struct iio_ring_buffer *ring);
-
#else /* CONFIG_IIO_RING_BUFFER */
-
-static inline void ad7476_uninitialize_ring(struct iio_ring_buffer *ring)
+static inline int ad7476_scan_from_ring(struct ad7476_state *st)
{
-}
-
-static inline int ad7476_initialize_ring(struct iio_ring_buffer *ring)
-{
return 0;
}
-
-static inline ssize_t ad7476_scan_from_ring(struct device *dev,
- struct device_attribute *attr,
- char *buf)
-{
- return 0;
-}
-
static inline int
ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev)
{
@@ -63,4 +74,4 @@
{
}
#endif /* CONFIG_IIO_RING_BUFFER */
-#endif /* _AD7476_H_ */
+#endif /* IIO_ADC_AD7476_H_ */
Modified: trunk/drivers/staging/iio/adc/ad7476_core.c (9385 => 9386)
--- trunk/drivers/staging/iio/adc/ad7476_core.c 2010-10-24 21:00:50 UTC (rev 9385)
+++ trunk/drivers/staging/iio/adc/ad7476_core.c 2010-10-24 21:04:58 UTC (rev 9386)
@@ -1,5 +1,5 @@
/*
- * AD7476/5/7/8 (A) SPI ADC driver
+ * AD7466/7/8 AD7476/5/7/8 (A) SPI ADC driver
*
* Copyright 2010 Analog Devices Inc.
*
@@ -14,33 +14,25 @@
#include <linux/sysfs.h>
#include <linux/list.h>
#include <linux/spi/spi.h>
+#include <linux/regulator/consumer.h>
+#include <linux/err.h>
#include "../iio.h"
#include "../sysfs.h"
+#include "../ring_generic.h"
+#include "adc.h"
#include "ad7476.h"
-static const struct ad7476_mode ad7476_mode_table[] = {
- {
- .name = "s0",
- .numvals = 1,
- },
-};
-
-static ssize_t ad7476_scan_direct(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static int ad7476_scan_direct(struct ad7476_state *st)
{
- struct iio_dev *dev_info = dev_get_drvdata(dev);
- struct ad7476_state *st = dev_info->dev_data;
int ret;
- struct spi_device *spi = st->spi;
- ret = spi_sync(spi, &st->msg);
+ ret = spi_sync(st->spi, &st->msg);
if (ret)
return ret;
- return sprintf(buf, "%d\n", (st->data[0] << 8) | st->data[1]);
+ return (st->data[0] << 8) | st->data[1];
}
static ssize_t ad7476_scan(struct device *dev,
@@ -48,51 +40,52 @@
char *buf)
{
struct iio_dev *dev_info = dev_get_drvdata(dev);
+ struct ad7476_state *st = dev_info->dev_data;
int ret;
mutex_lock(&dev_info->mlock);
- if (dev_info->currentmode == INDIO_RING_TRIGGERED)
- ret = ad7476_scan_from_ring(dev, attr, buf);
+ if (iio_ring_enabled(dev_info))
+ ret = ad7476_scan_from_ring(st);
else
- ret = ad7476_scan_direct(dev, attr, buf);
+ ret = ad7476_scan_direct(st);
mutex_unlock(&dev_info->mlock);
- return ret;
+ if (ret < 0)
+ return ret;
+
+ return sprintf(buf, "%d\n", (ret >> st->chip_info->res_shift) &
+ RES_MASK(st->chip_info->bits));
}
+static IIO_DEV_ATTR_IN_RAW(0, ad7476_scan, 0);
-/* Cannot query the device, so use local copy of state */
-static ssize_t ad7476_show_scan_mode(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static ssize_t ad7476_show_scale(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
{
+ /* Driver currently only support internal vref */
struct iio_dev *dev_info = dev_get_drvdata(dev);
- struct ad7476_state *st = dev_info->dev_data;
+ struct ad7476_state *st = iio_dev_get_devdata(dev_info);
+ /* Corresponds to Vref / 2^(bits) */
+ unsigned int scale_uv = (st->int_vref_mv * 1000) >> st->chip_info->bits;
- return sprintf(buf, "%s\n", st->current_mode->name);
+ return sprintf(buf, "%d.%d\n", scale_uv / 1000, scale_uv % 1000);
}
+static IIO_DEVICE_ATTR(in_scale, S_IRUGO, ad7476_show_scale, NULL, 0);
-
-static IIO_DEV_ATTR_AVAIL_SCAN_MODES(ad7476_show_scan_mode);
-static IIO_DEV_ATTR_SCAN_MODE(S_IRUGO | S_IWUSR,
- ad7476_show_scan_mode, NULL);
-
-static IIO_DEV_ATTR_SCAN(ad7476_scan);
-
static ssize_t ad7476_show_name(struct device *dev,
struct device_attribute *attr,
char *buf)
{
- return sprintf(buf, "%s\n", CHIP_NAME);
+ struct iio_dev *dev_info = dev_get_drvdata(dev);
+ struct ad7476_state *st = iio_dev_get_devdata(dev_info);
+
+ return sprintf(buf, "%s\n", spi_get_device_id(st->spi)->name);
}
-
static IIO_DEVICE_ATTR(name, S_IRUGO, ad7476_show_name, NULL, 0);
-/*name export */
-
static struct attribute *ad7476_attributes[] = {
- &iio_dev_attr_available_scan_modes.dev_attr.attr,
- &iio_dev_attr_scan_mode.dev_attr.attr,
- &iio_dev_attr_scan.dev_attr.attr,
+ &iio_dev_attr_in0_raw.dev_attr.attr,
+ &iio_dev_attr_in_scale.dev_attr.attr,
&iio_dev_attr_name.dev_attr.attr,
NULL,
};
@@ -101,15 +94,91 @@
.attrs = ad7476_attributes,
};
+static const struct ad7476_chip_info ad7476_chip_info_tbl[] = {
+ [ID_AD7466] = {
+ .bits = 12,
+ .storagebits = 16,
+ .res_shift = 0,
+ .sign = IIO_SCAN_EL_TYPE_UNSIGNED,
+ },
+ [ID_AD7467] = {
+ .bits = 10,
+ .storagebits = 16,
+ .res_shift = 2,
+ .sign = IIO_SCAN_EL_TYPE_UNSIGNED,
+ },
+ [ID_AD7468] = {
+ .bits = 8,
+ .storagebits = 16,
+ .res_shift = 4,
+ .sign = IIO_SCAN_EL_TYPE_UNSIGNED,
+ },
+ [ID_AD7475] = {
+ .bits = 12,
+ .storagebits = 16,
+ .res_shift = 0,
+ .sign = IIO_SCAN_EL_TYPE_UNSIGNED,
+ },
+ [ID_AD7476] = {
+ .bits = 12,
+ .storagebits = 16,
+ .res_shift = 0,
+ .sign = IIO_SCAN_EL_TYPE_UNSIGNED,
+ },
+ [ID_AD7477] = {
+ .bits = 10,
+ .storagebits = 16,
+ .res_shift = 2,
+ .sign = IIO_SCAN_EL_TYPE_UNSIGNED,
+ },
+ [ID_AD7478] = {
+ .bits = 8,
+ .storagebits = 16,
+ .res_shift = 4,
+ .sign = IIO_SCAN_EL_TYPE_UNSIGNED,
+ },
+ [ID_AD7495] = {
+ .bits = 12,
+ .storagebits = 16,
+ .res_shift = 0,
+ .int_vref_mv = 2500,
+ .sign = IIO_SCAN_EL_TYPE_UNSIGNED,
+ },
+};
+
static int __devinit ad7476_probe(struct spi_device *spi)
{
- int ret;
- struct ad7476_state *st = kzalloc(sizeof(*st), GFP_KERNEL);
+ struct ad7476_platform_data *pdata = spi->dev.platform_data;
+ struct ad7476_state *st;
+ int ret, voltage_uv = 0;
+
+ st = kzalloc(sizeof(*st), GFP_KERNEL);
if (st == NULL) {
ret = -ENOMEM;
goto error_ret;
}
+ st->reg = regulator_get(&spi->dev, "vcc");
+ if (!IS_ERR(st->reg)) {
+ ret = regulator_enable(st->reg);
+ if (ret)
+ goto error_put_reg;
+
+ voltage_uv = regulator_get_voltage(st->reg);
+ }
+
+ st->chip_info =
+ &ad7476_chip_info_tbl[spi_get_device_id(spi)->driver_data];
+
+ if (st->chip_info->int_vref_mv)
+ st->int_vref_mv = st->chip_info->int_vref_mv;
+ else if (pdata && pdata->vref_mv)
+ st->int_vref_mv = pdata->vref_mv;
+ else if (voltage_uv)
+ st->int_vref_mv = voltage_uv / 1000;
+ else
+ dev_warn(&spi->dev, "reference voltage unspecified\n");
+
spi_set_drvdata(spi, st);
atomic_set(&st->protect_ring, 0);
@@ -118,7 +187,7 @@
st->indio_dev = iio_allocate_device();
if (st->indio_dev == NULL) {
ret = -ENOMEM;
- goto error_free_st;
+ goto error_disable_reg;
}
/* Estabilish that the iio_dev is a child of the i2c device */
@@ -128,12 +197,10 @@
st->indio_dev->driver_module = THIS_MODULE;
st->indio_dev->modes = INDIO_DIRECT_MODE;
- st->current_mode = &ad7476_mode_table[0];
-
/* Setup default message */
st->xfer.rx_buf = &st->data;
- st->xfer.len = st->current_mode->numvals * 2;
+ st->xfer.len = st->chip_info->storagebits / 8;
spi_message_init(&st->msg);
spi_message_add_tail(&st->xfer, &st->msg);
@@ -146,7 +213,7 @@
if (ret)
goto error_free_device;
- ret = ad7476_initialize_ring(st->indio_dev->ring);
+ ret = iio_ring_buffer_register(st->indio_dev->ring, 0);
if (ret)
goto error_cleanup_ring;
return 0;
@@ -156,7 +223,12 @@
iio_device_unregister(st->indio_dev);
error_free_device:
iio_free_device(st->indio_dev);
-error_free_st:
+error_disable_reg:
+ if (!IS_ERR(st->reg))
+ regulator_disable(st->reg);
+error_put_reg:
+ if (!IS_ERR(st->reg))
+ regulator_put(st->reg);
kfree(st);
error_ret:
return ret;
@@ -166,14 +238,31 @@
{
struct ad7476_state *st = spi_get_drvdata(spi);
struct iio_dev *indio_dev = st->indio_dev;
- ad7476_uninitialize_ring(indio_dev->ring);
+ iio_ring_buffer_unregister(indio_dev->ring);
ad7476_ring_cleanup(indio_dev);
iio_device_unregister(indio_dev);
+ if (!IS_ERR(st->reg)) {
+ regulator_disable(st->reg);
+ regulator_put(st->reg);
+ }
kfree(st);
-
return 0;
}
+static const struct spi_device_id ad7476_id[] = {
+ {"ad7466", ID_AD7466},
+ {"ad7467", ID_AD7467},
+ {"ad7468", ID_AD7468},
+ {"ad7475", ID_AD7475},
+ {"ad7476", ID_AD7476},
+ {"ad7476a", ID_AD7476},
+ {"ad7477", ID_AD7477},
+ {"ad7477a", ID_AD7477},
+ {"ad7478", ID_AD7478},
+ {"ad7478a", ID_AD7478},
+ {"ad7495", ID_AD7495},
+ {}
+};
static struct spi_driver ad7476_driver = {
.driver = {
@@ -183,6 +272,7 @@
},
.probe = ad7476_probe,
.remove = __devexit_p(ad7476_remove),
+ .id_table = ad7476_id,
};
static int __init ad7476_init(void)
@@ -198,6 +288,6 @@
module_exit(ad7476_exit);
MODULE_AUTHOR("Michael Hennerich <[email protected]>");
-MODULE_DESCRIPTION("Analog Devices AD7475/6/7/8(A) ADC");
+MODULE_DESCRIPTION("Analog Devices AD7475/6/7/8(A) AD7466/7/8 ADC");
MODULE_LICENSE("GPL v2");
MODULE_ALIAS("spi:ad7476");
Modified: trunk/drivers/staging/iio/adc/ad7476_ring.c (9385 => 9386)
--- trunk/drivers/staging/iio/adc/ad7476_ring.c 2010-10-24 21:00:50 UTC (rev 9385)
+++ trunk/drivers/staging/iio/adc/ad7476_ring.c 2010-10-24 21:04:58 UTC (rev 9386)
@@ -25,32 +25,50 @@
#include "ad7476.h"
-ssize_t ad7476_scan_from_ring(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static IIO_SCAN_EL_C(in0, 0, 0, NULL);
+
+static ssize_t ad7476_show_type(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
{
- struct iio_dev *dev_info = dev_get_drvdata(dev);
- struct ad7476_state *info = dev_info->dev_data;
- int i, ret, len = 0;
- char *ring_data;
+ struct iio_ring_buffer *ring = dev_get_drvdata(dev);
+ struct iio_dev *indio_dev = ring->indio_dev;
+ struct ad7476_state *st = indio_dev->dev_data;
- ring_data = kmalloc(info->current_mode->numvals*2, GFP_KERNEL);
+ return sprintf(buf, "%c%d/%d>>%d\n", st->chip_info->sign,
+ st->chip_info->bits, st->chip_info->storagebits,
+ st->chip_info->res_shift);
+}
+static IIO_DEVICE_ATTR(in_type, S_IRUGO, ad7476_show_type, NULL, 0);
+
+static struct attribute *ad7476_scan_el_attrs[] = {
+ &iio_scan_el_in0.dev_attr.attr,
+ &iio_const_attr_in0_index.dev_attr.attr,
+ &iio_dev_attr_in_type.dev_attr.attr,
+ NULL,
+};
+
+static struct attribute_group ad7476_scan_el_group = {
+ .name = "scan_elements",
+ .attrs = ad7476_scan_el_attrs,
+};
+
+int ad7476_scan_from_ring(struct ad7476_state *st)
+{
+ struct iio_ring_buffer *ring = st->indio_dev->ring;
+ int ret;
+ u8 *ring_data;
+
+ ring_data = kmalloc(ring->access.get_bytes_per_datum(ring), GFP_KERNEL);
if (ring_data == NULL) {
ret = -ENOMEM;
goto error_ret;
}
- ret = dev_info->ring->access.read_last(dev_info->ring, ring_data);
+ ret = ring->access.read_last(ring, ring_data);
if (ret)
goto error_free_ring_data;
- len += sprintf(buf+len, "ring ");
- for (i = 0; i < info->current_mode->numvals; i++)
- len += sprintf(buf + len, "%d ",
- ((int)(ring_data[i*2 + 0] & 0xFF) << 8)
- + ((int)(ring_data[i*2 + 1])));
- len += sprintf(buf + len, "\n");
- kfree(ring_data);
- return len;
+ ret = (ring_data[0] << 8) | ring_data[1];
error_free_ring_data:
kfree(ring_data);
@@ -70,59 +88,29 @@
struct ad7476_state *st = indio_dev->dev_data;
size_t d_size;
- if (indio_dev->ring->access.set_bpd) {
- d_size = st->current_mode->numvals*2 + sizeof(s64);
+ if (indio_dev->ring->access.set_bytes_per_datum) {
+ d_size = st->chip_info->storagebits / 8 + sizeof(s64);
if (d_size % 8)
d_size += 8 - (d_size % 8);
- indio_dev->ring->access.set_bpd(indio_dev->ring, d_size);
+ indio_dev->ring->access.set_bytes_per_datum(indio_dev->ring,
+ d_size);
}
return 0;
}
/**
- * ad7476_ring_postenable() typical ring post enable
- *
- * Only not moved into the core for the hardware ring buffer cases
- * that are more sophisticated.
- **/
-static int ad7476_ring_postenable(struct iio_dev *indio_dev)
-{
- if (indio_dev->trig == NULL)
- return 0;
- return iio_trigger_attach_poll_func(indio_dev->trig,
- indio_dev->pollfunc);
-}
-
-/**
- * ad7476_ring_predisable() runs just prior to ring buffer being disabled
- *
- * Typical predisable function which ensures that no trigger events can
- * occur before we disable the ring buffer (and hence would have no idea
- * what to do with them)
- **/
-static int ad7476_ring_predisable(struct iio_dev *indio_dev)
-{
- if (indio_dev->trig)
- return iio_trigger_dettach_poll_func(indio_dev->trig,
- indio_dev->pollfunc);
- else
- return 0;
-}
-
-/**
* ad7476_poll_func_th() th of trigger launched polling to ring buffer
*
* As sampling only occurs on i2c comms occuring, leave timestamping until
* then. Some triggers will generate their own time stamp. Currently
* there is no way of notifying them when no one cares.
**/
-void ad7476_poll_func_th(struct iio_dev *indio_dev)
+static void ad7476_poll_func_th(struct iio_dev *indio_dev, s64 time)
{
struct ad7476_state *st = indio_dev->dev_data;
schedule_work(&st->poll_work);
-
return;
}
/**
@@ -139,14 +127,14 @@
struct ad7476_state *st = container_of(work_s, struct ad7476_state,
poll_work);
struct iio_dev *indio_dev = st->indio_dev;
- struct iio_sw_ring_buffer *ring = iio_to_sw_ring(indio_dev->ring);
+ struct iio_sw_ring_buffer *sw_ring = iio_to_sw_ring(indio_dev->ring);
s64 time_ns;
__u8 *rxbuf;
int b_sent;
size_t d_size;
/* Ensure the timestamp is 8 byte aligned */
- d_size = st->current_mode->numvals*2 + sizeof(s64);
+ d_size = st->chip_info->storagebits / 8 + sizeof(s64);
if (d_size % sizeof(s64))
d_size += sizeof(s64) - (d_size % sizeof(s64));
@@ -154,19 +142,11 @@
if (atomic_inc_return(&st->protect_ring) > 1)
return;
- /* Monitor mode prevents reading. Whilst not currently implemented
- * might as well have this test in here in the meantime as it does
- * no harm.
- */
- if (st->current_mode->numvals == 0)
- return;
-
- rxbuf = kmalloc(d_size, GFP_KERNEL);
+ rxbuf = kzalloc(d_size, GFP_KERNEL);
if (rxbuf == NULL)
return;
- b_sent = spi_read(st->spi, rxbuf,
- st->current_mode->numvals * 2);
+ b_sent = spi_read(st->spi, rxbuf, st->chip_info->storagebits / 8);
if (b_sent < 0)
goto done;
@@ -174,13 +154,12 @@
memcpy(rxbuf + d_size - sizeof(s64), &time_ns, sizeof(time_ns));
- indio_dev->ring->access.store_to(&ring->buf, rxbuf, time_ns);
+ indio_dev->ring->access.store_to(&sw_ring->buf, rxbuf, time_ns);
done:
kfree(rxbuf);
atomic_dec(&st->protect_ring);
}
-
int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev)
{
struct ad7476_state *st = indio_dev->dev_data;
@@ -192,20 +171,18 @@
goto error_ret;
}
/* Effectively select the ring buffer implementation */
- iio_ring_sw_register_funcs(&st->indio_dev->ring->access);
- indio_dev->pollfunc = kzalloc(sizeof(*indio_dev->pollfunc), GFP_KERNEL);
- if (indio_dev->pollfunc == NULL) {
- ret = -ENOMEM;
+ iio_ring_sw_register_funcs(&indio_dev->ring->access);
+ ret = iio_alloc_pollfunc(indio_dev, NULL, &ad7476_poll_func_th);
+ if (ret)
goto error_deallocate_sw_rb;
- }
- /* Configure the polling function called on trigger interrupts */
- indio_dev->pollfunc->poll_func_main = &ad7476_poll_func_th;
- indio_dev->pollfunc->private_data = indio_dev;
/* Ring buffer functions - here trigger setup related */
- indio_dev->ring->postenable = &ad7476_ring_postenable;
+
indio_dev->ring->preenable = &ad7476_ring_preenable;
- indio_dev->ring->predisable = &ad7476_ring_predisable;
+ indio_dev->ring->postenable = &iio_triggered_ring_postenable;
+ indio_dev->ring->predisable = &iio_triggered_ring_predisable;
+ indio_dev->ring->scan_el_attrs = &ad7476_scan_el_group;
+
INIT_WORK(&st->poll_work, &ad7476_poll_bh_to_ring);
/* Flag that polled ring buffering is possible */
@@ -228,13 +205,3 @@
kfree(indio_dev->pollfunc);
iio_sw_rb_free(indio_dev->ring);
}
-
-void ad7476_uninitialize_ring(struct iio_ring_buffer *ring)
-{
- iio_ring_buffer_unregister(ring);
-}
-
-int ad7476_initialize_ring(struct iio_ring_buffer *ring)
-{
- return iio_ring_buffer_register(ring, 0);
-}
Modified: trunk/drivers/staging/iio/adc/ad799x.h (9385 => 9386)
--- trunk/drivers/staging/iio/adc/ad799x.h 2010-10-24 21:00:50 UTC (rev 9385)
+++ trunk/drivers/staging/iio/adc/ad799x.h 2010-10-24 21:04:58 UTC (rev 9386)
@@ -13,7 +13,7 @@
#define _AD799X_H_
#define AD799X_CHANNEL_SHIFT 4
-
+#define AD799X_STORAGEBITS 16
/*
* AD7991, AD7995 and AD7999 defines
*/
@@ -97,6 +97,8 @@
struct ad799x_chip_info {
u8 num_inputs;
u8 bits;
+ u8 storagebits;
+ char sign;
u16 int_vref_mv;
bool monitor_mode;
u16 default_config;
@@ -124,7 +126,7 @@
};
/*
- * TODO: struct ad799x_platform_data needs to go into inlude/linux/iio
+ * TODO: struct ad799x_platform_data needs to go into include/linux/iio
*/
struct ad799x_platform_data {
@@ -137,18 +139,7 @@
int ad799x_single_channel_from_ring(struct ad799x_state *st, long mask);
int ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev);
void ad799x_ring_cleanup(struct iio_dev *indio_dev);
-int ad799x_initialize_ring(struct iio_ring_buffer *ring);
-void ad799x_uninitialize_ring(struct iio_ring_buffer *ring);
#else /* CONFIG_AD799X_RING_BUFFER */
-static inline void ad799x_uninitialize_ring(struct iio_ring_buffer *ring)
-{
-}
-
-static inline int ad799x_initialize_ring(struct iio_ring_buffer *ring)
-{
- return 0;
-}
-
int ad799x_single_channel_from_ring(struct ad799x_state *st, long mask)
{
return -EINVAL;
Modified: trunk/drivers/staging/iio/adc/ad799x_core.c (9385 => 9386)
--- trunk/drivers/staging/iio/adc/ad799x_core.c 2010-10-24 21:00:50 UTC (rev 9385)
+++ trunk/drivers/staging/iio/adc/ad799x_core.c 2010-10-24 21:04:58 UTC (rev 9386)
@@ -105,15 +105,14 @@
bool state)
{
struct ad799x_state *st = indio_dev->dev_data;
- return ad799x_set_scan_mode(st, st->indio_dev->scan_mask);
+ return ad799x_set_scan_mode(st, st->indio_dev->ring->scan_mask);
}
/* Here we claim all are 16 bits. This currently does no harm and saves
* us a lot of scan element listings */
#define AD799X_SCAN_EL(number) \
- IIO_SCAN_EL_C(in##number, number, IIO_UNSIGNED(16), 0, \
- ad799x_scan_el_set_state);
+ IIO_SCAN_EL_C(in##number, number, 0, ad799x_scan_el_set_state);
static AD799X_SCAN_EL(0);
static AD799X_SCAN_EL(1);
@@ -124,18 +123,19 @@
static AD799X_SCAN_EL(6);
static AD799X_SCAN_EL(7);
-static ssize_t ad799x_show_precision(struct device *dev,
+static ssize_t ad799x_show_type(struct device *dev,
struct device_attribute *attr,
char *buf)
{
- struct iio_dev *dev_info = dev_get_drvdata(dev);
- struct ad799x_state *st = iio_dev_get_devdata(dev_info);
- return sprintf(buf, "%d\n", st->chip_info->bits);
+ struct iio_ring_buffer *ring = dev_get_drvdata(dev);
+ struct iio_dev *indio_dev = ring->indio_dev;
+ struct ad799x_state *st = indio_dev->dev_data;
+
+ return sprintf(buf, "%c%d/%d\n", st->chip_info->sign,
+ st->chip_info->bits, AD799X_STORAGEBITS);
}
+static IIO_DEVICE_ATTR(in_type, S_IRUGO, ad799x_show_type, NULL, 0);
-static IIO_DEVICE_ATTR(in_precision, S_IRUGO, ad799x_show_precision,
- NULL, 0);
-
static int ad7991_5_9_set_scan_mode(struct ad799x_state *st, unsigned mask)
{
return i2c_smbus_write_byte(st->client,
@@ -212,11 +212,11 @@
if (ret < 0)
goto error_ret;
- data = "" & 0xFFF;
+ data = ""
}
/* Pretty print the result */
- len = sprintf(buf, "%u\n", data);
+ len = sprintf(buf, "%u\n", data & ((1 << (st->chip_info->bits)) - 1));
error_ret:
mutex_unlock(&dev_info->mlock);
@@ -369,15 +369,6 @@
return ret ? ret : len;
}
-#define IIO_EVENT_CODE_AD7998_IN0_LOW (IIO_EVENT_CODE_DEVICE_SPECIFIC + 0)
-#define IIO_EVENT_CODE_AD7998_IN0_HIGH (IIO_EVENT_CODE_DEVICE_SPECIFIC + 1)
-#define IIO_EVENT_CODE_AD7998_IN1_LOW (IIO_EVENT_CODE_DEVICE_SPECIFIC + 2)
-#define IIO_EVENT_CODE_AD7998_IN1_HIGH (IIO_EVENT_CODE_DEVICE_SPECIFIC + 3)
-#define IIO_EVENT_CODE_AD7998_IN2_LOW (IIO_EVENT_CODE_DEVICE_SPECIFIC + 4)
-#define IIO_EVENT_CODE_AD7998_IN2_HIGH (IIO_EVENT_CODE_DEVICE_SPECIFIC + 5)
-#define IIO_EVENT_CODE_AD7998_IN3_LOW (IIO_EVENT_CODE_DEVICE_SPECIFIC + 6)
-#define IIO_EVENT_CODE_AD7998_IN3_HIGH (IIO_EVENT_CODE_DEVICE_SPECIFIC + 7)
-
static void ad799x_interrupt_bh(struct work_struct *work_s)
{
struct ad799x_state *st = container_of(work_s,
@@ -396,7 +387,9 @@
for (i = 0; i < 8; i++) {
if (status & (1 << i))
iio_push_event(st->indio_dev, 0,
- IIO_EVENT_CODE_AD7998_IN0_LOW + i,
+ i & 0x1 ?
+ IIO_EVENT_CODE_IN_HIGH_THRESH(i >> 1) :
+ IIO_EVENT_CODE_IN_LOW_THRESH(i >> 1),
st->last_timestamp);
}
@@ -435,14 +428,11 @@
/* Driver currently only support internal vref */
struct iio_dev *dev_info = dev_get_drvdata(dev);
struct ad799x_state *st = iio_dev_get_devdata(dev_info);
+
/* Corresponds to Vref / 2^(bits) */
+ unsigned int scale_uv = (st->int_vref_mv * 1000) >> st->chip_info->bits;
- if ((1 << (st->chip_info->bits + 1))
- > st->int_vref_mv)
- return sprintf(buf, "0.5\n");
- else
- return sprintf(buf, "%d\n",
- st->int_vref_mv >> st->chip_info->bits);
+ return sprintf(buf, "%d.%d\n", scale_uv / 1000, scale_uv % 1000);
}
static IIO_DEVICE_ATTR(in_scale, S_IRUGO, ad799x_show_scale, NULL, 0);
@@ -474,10 +464,14 @@
static struct attribute *ad7991_5_9_3_4_scan_el_attrs[] = {
&iio_scan_el_in0.dev_attr.attr,
+ &iio_const_attr_in0_index.dev_attr.attr,
&iio_scan_el_in1.dev_attr.attr,
+ &iio_const_attr_in1_index.dev_attr.attr,
&iio_scan_el_in2.dev_attr.attr,
+ &iio_const_attr_in2_index.dev_attr.attr,
&iio_scan_el_in3.dev_attr.attr,
- &iio_dev_attr_in_precision.dev_attr.attr,
+ &iio_const_attr_in3_index.dev_attr.attr,
+ &iio_dev_attr_in_type.dev_attr.attr,
NULL,
};
@@ -500,8 +494,10 @@
static struct attribute *ad7992_scan_el_attrs[] = {
&iio_scan_el_in0.dev_attr.attr,
+ &iio_const_attr_in0_index.dev_attr.attr,
&iio_scan_el_in1.dev_attr.attr,
- &iio_dev_attr_in_precision.dev_attr.attr,
+ &iio_const_attr_in1_index.dev_attr.attr,
+ &iio_dev_attr_in_type.dev_attr.attr,
NULL,
};
@@ -530,14 +526,22 @@
static struct attribute *ad7997_8_scan_el_attrs[] = {
&iio_scan_el_in0.dev_attr.attr,
+ &iio_const_attr_in0_index.dev_attr.attr,
&iio_scan_el_in1.dev_attr.attr,
+ &iio_const_attr_in1_index.dev_attr.attr,
&iio_scan_el_in2.dev_attr.attr,
+ &iio_const_attr_in2_index.dev_attr.attr,
&iio_scan_el_in3.dev_attr.attr,
+ &iio_const_attr_in3_index.dev_attr.attr,
&iio_scan_el_in4.dev_attr.attr,
+ &iio_const_attr_in4_index.dev_attr.attr,
&iio_scan_el_in5.dev_attr.attr,
+ &iio_const_attr_in5_index.dev_attr.attr,
&iio_scan_el_in6.dev_attr.attr,
+ &iio_const_attr_in6_index.dev_attr.attr,
&iio_scan_el_in7.dev_attr.attr,
- &iio_dev_attr_in_precision.dev_attr.attr,
+ &iio_const_attr_in7_index.dev_attr.attr,
+ &iio_dev_attr_in_type.dev_attr.attr,
NULL,
};
@@ -665,6 +669,7 @@
[ad7991] = {
.num_inputs = 4,
.bits = 12,
+ .sign = IIO_SCAN_EL_TYPE_UNSIGNED,
.int_vref_mv = 4096,
.dev_attrs = &ad7991_5_9_3_4_dev_attr_group,
.scan_attrs = &ad7991_5_9_3_4_scan_el_group,
@@ -673,6 +678,7 @@
[ad7995] = {
.num_inputs = 4,
.bits = 10,
+ .sign = IIO_SCAN_EL_TYPE_UNSIGNED,
.int_vref_mv = 1024,
.dev_attrs = &ad7991_5_9_3_4_dev_attr_group,
.scan_attrs = &ad7991_5_9_3_4_scan_el_group,
@@ -681,6 +687,7 @@
[ad7999] = {
.num_inputs = 4,
.bits = 10,
+ .sign = IIO_SCAN_EL_TYPE_UNSIGNED,
.int_vref_mv = 1024,
.dev_attrs = &ad7991_5_9_3_4_dev_attr_group,
.scan_attrs = &ad7991_5_9_3_4_scan_el_group,
@@ -689,6 +696,7 @@
[ad7992] = {
.num_inputs = 2,
.bits = 12,
+ .sign = IIO_SCAN_EL_TYPE_UNSIGNED,
.int_vref_mv = 4096,
.monitor_mode = true,
.default_config = AD7998_ALERT_EN,
@@ -700,6 +708,7 @@
[ad7993] = {
.num_inputs = 4,
.bits = 10,
+ .sign = IIO_SCAN_EL_TYPE_UNSIGNED,
.int_vref_mv = 1024,
.monitor_mode = true,
.default_config = AD7998_ALERT_EN,
@@ -711,6 +720,7 @@
[ad7994] = {
.num_inputs = 4,
.bits = 12,
+ .sign = IIO_SCAN_EL_TYPE_UNSIGNED,
.int_vref_mv = 4096,
.monitor_mode = true,
.default_config = AD7998_ALERT_EN,
@@ -722,6 +732,7 @@
[ad7997] = {
.num_inputs = 8,
.bits = 10,
+ .sign = IIO_SCAN_EL_TYPE_UNSIGNED,
.int_vref_mv = 1024,
.monitor_mode = true,
.default_config = AD7998_ALERT_EN,
@@ -733,6 +744,7 @@
[ad7998] = {
.num_inputs = 8,
.bits = 12,
+ .sign = IIO_SCAN_EL_TYPE_UNSIGNED,
.int_vref_mv = 4096,
.monitor_mode = true,
.default_config = AD7998_ALERT_EN,
@@ -786,7 +798,6 @@
/* Estabilish that the iio_dev is a child of the i2c device */
st->indio_dev->dev.parent = &client->dev;
st->indio_dev->attrs = st->chip_info->dev_attrs;
- st->indio_dev->scan_el_attrs = st->chip_info->scan_attrs;
st->indio_dev->event_attrs = st->chip_info->event_attrs;
st->indio_dev->dev_data = (void *)(st);
@@ -806,7 +817,8 @@
if (ret)
goto error_cleanup_ring;
regdone = 1;
- ret = ad799x_initialize_ring(st->indio_dev->ring);
+
+ ret = iio_ring_buffer_register(st->indio_dev->ring, 0);
if (ret)
goto error_cleanup_ring;
@@ -857,7 +869,7 @@
if (client->irq > 0 && st->chip_info->monitor_mode)
iio_unregister_interrupt_line(indio_dev, 0);
- ad799x_uninitialize_ring(indio_dev->ring);
+ iio_ring_buffer_unregister(indio_dev->ring);
ad799x_ring_cleanup(indio_dev);
iio_device_unregister(indio_dev);
if (!IS_ERR(st->reg)) {
Modified: trunk/drivers/staging/iio/adc/ad799x_ring.c (9385 => 9386)
--- trunk/drivers/staging/iio/adc/ad799x_ring.c 2010-10-24 21:00:50 UTC (rev 9385)
+++ trunk/drivers/staging/iio/adc/ad799x_ring.c 2010-10-24 21:04:58 UTC (rev 9386)
@@ -29,33 +29,32 @@
int ad799x_single_channel_from_ring(struct ad799x_state *st, long mask)
{
- unsigned long numvals;
+ struct iio_ring_buffer *ring = st->indio_dev->ring;
int count = 0, ret;
u16 *ring_data;
- if (!(st->indio_dev->scan_mask & mask)) {
+
+ if (!(ring->scan_mask & mask)) {
ret = -EBUSY;
goto error_ret;
}
- numvals = st->indio_dev->scan_count;
- ring_data = kmalloc(numvals*2, GFP_KERNEL);
+ ring_data = kmalloc(ring->access.get_bytes_per_datum(ring), GFP_KERNEL);
if (ring_data == NULL) {
ret = -ENOMEM;
goto error_ret;
}
- ret = st->indio_dev->ring->access.read_last(st->indio_dev->ring,
- (u8 *) ring_data);
+ ret = ring->access.read_last(ring, (u8 *) ring_data);
if (ret)
goto error_free_ring_data;
/* Need a count of channels prior to this one */
mask >>= 1;
while (mask) {
- if (mask & st->indio_dev->scan_mask)
+ if (mask & ring->scan_mask)
count++;
mask >>= 1;
}
- ret = be16_to_cpu(ring_data[count]) & 0xFFF;
+ ret = be16_to_cpu(ring_data[count]);
error_free_ring_data:
kfree(ring_data);
@@ -72,6 +71,7 @@
**/
static int ad799x_ring_preenable(struct iio_dev *indio_dev)
{
+ struct iio_ring_buffer *ring = indio_dev->ring;
struct ad799x_state *st = indio_dev->dev_data;
size_t d_size;
unsigned long numvals;
@@ -82,58 +82,28 @@
*/
if (st->id == ad7997 || st->id == ad7998)
- ad799x_set_scan_mode(st, st->indio_dev->scan_mask);
+ ad799x_set_scan_mode(st, ring->scan_mask);
- numvals = st->indio_dev->scan_count;
+ numvals = ring->scan_count;
- if (indio_dev->ring->access.set_bpd) {
+ if (ring->access.set_bytes_per_datum) {
d_size = numvals*2 + sizeof(s64);
if (d_size % 8)
d_size += 8 - (d_size % 8);
- indio_dev->ring->access.set_bpd(indio_dev->ring, d_size);
+ ring->access.set_bytes_per_datum(ring, d_size);
}
return 0;
}
/**
- * ad799x_ring_postenable() typical ring post enable
- *
- * Only not moved into the core for the hardware ring buffer cases
- * that are more sophisticated.
- **/
-static int ad799x_ring_postenable(struct iio_dev *indio_dev)
-{
- if (indio_dev->trig == NULL)
- return 0;
- return iio_trigger_attach_poll_func(indio_dev->trig,
- indio_dev->pollfunc);
-}
-
-/**
- * ad799x_ring_predisable() runs just prior to ring buffer being disabled
- *
- * Typical predisable function which ensures that no trigger events can
- * occur before we disable the ring buffer (and hence would have no idea
- * what to do with them)
- **/
-static int ad799x_ring_predisable(struct iio_dev *indio_dev)
-{
- if (indio_dev->trig)
- return iio_trigger_dettach_poll_func(indio_dev->trig,
- indio_dev->pollfunc);
- else
- return 0;
-}
-
-/**
* ad799x_poll_func_th() th of trigger launched polling to ring buffer
*
* As sampling only occurs on i2c comms occuring, leave timestamping until
* then. Some triggers will generate their own time stamp. Currently
* there is no way of notifying them when no one cares.
**/
-static void ad799x_poll_func_th(struct iio_dev *indio_dev)
+static void ad799x_poll_func_th(struct iio_dev *indio_dev, s64 time)
{
struct ad799x_state *st = indio_dev->dev_data;
@@ -155,14 +125,15 @@
struct ad799x_state *st = container_of(work_s, struct ad799x_state,
poll_work);
struct iio_dev *indio_dev = st->indio_dev;
- struct iio_sw_ring_buffer *ring = iio_to_sw_ring(indio_dev->ring);
+ struct iio_ring_buffer *ring = indio_dev->ring;
+ struct iio_sw_ring_buffer *ring_sw = iio_to_sw_ring(indio_dev->ring);
s64 time_ns;
__u8 *rxbuf;
int b_sent;
size_t d_size;
u8 cmd;
- unsigned long numvals = st->indio_dev->scan_count;
+ unsigned long numvals = ring->scan_count;
/* Ensure the timestamp is 8 byte aligned */
d_size = numvals*2 + sizeof(s64);
@@ -189,14 +160,13 @@
case ad7991:
case ad7995:
case ad7999:
- cmd = st->config |
- (st->indio_dev->scan_mask << AD799X_CHANNEL_SHIFT);
+ cmd = st->config | (ring->scan_mask << AD799X_CHANNEL_SHIFT);
break;
case ad7992:
case ad7993:
case ad7994:
- cmd = (st->indio_dev->scan_mask <<
- AD799X_CHANNEL_SHIFT) | AD7998_CONV_RES_REG;
+ cmd = (ring->scan_mask << AD799X_CHANNEL_SHIFT) |
+ AD7998_CONV_RES_REG;
break;
case ad7997:
case ad7998:
@@ -215,7 +185,7 @@
memcpy(rxbuf + d_size - sizeof(s64), &time_ns, sizeof(time_ns));
- indio_dev->ring->access.store_to(&ring->buf, rxbuf, time_ns);
+ ring->access.store_to(&ring_sw->buf, rxbuf, time_ns);
done:
kfree(rxbuf);
atomic_dec(&st->protect_ring);
@@ -234,21 +204,20 @@
}
/* Effectively select the ring buffer implementation */
iio_ring_sw_register_funcs(&st->indio_dev->ring->access);
- indio_dev->pollfunc = kzalloc(sizeof(*indio_dev->pollfunc), GFP_KERNEL);
- if (indio_dev->pollfunc == NULL) {
- ret = -ENOMEM;
+ ret = iio_alloc_pollfunc(indio_dev, NULL, &ad799x_poll_func_th);
+ if (ret)
goto error_deallocate_sw_rb;
- }
- /* Configure the polling function called on trigger interrupts */
- indio_dev->pollfunc->poll_func_main = &ad799x_poll_func_th;
- indio_dev->pollfunc->private_data = indio_dev;
/* Ring buffer functions - here trigger setup related */
- indio_dev->ring->postenable = &ad799x_ring_postenable;
+
indio_dev->ring->preenable = &ad799x_ring_preenable;
- indio_dev->ring->predisable = &ad799x_ring_predisable;
+ indio_dev->ring->postenable = &iio_triggered_ring_postenable;
+ indio_dev->ring->predisable = &iio_triggered_ring_predisable;
+
INIT_WORK(&st->poll_work, &ad799x_poll_bh_to_ring);
+ indio_dev->ring->scan_el_attrs = st->chip_info->scan_attrs;
+
/* Flag that polled ring buffering is possible */
indio_dev->modes |= INDIO_RING_TRIGGERED;
return 0;
@@ -269,13 +238,3 @@
kfree(indio_dev->pollfunc);
iio_sw_rb_free(indio_dev->ring);
}
-
-void ad799x_uninitialize_ring(struct iio_ring_buffer *ring)
-{
- iio_ring_buffer_unregister(ring);
-}
-
-int ad799x_initialize_ring(struct iio_ring_buffer *ring)
-{
- return iio_ring_buffer_register(ring, 0);
-}
