Commit dcfb0863 authored by Michael Hennerich's avatar Michael Hennerich Committed by Greg Kroah-Hartman

IIO: ADC: AD7606: Update timestamp handling

Add timestamp attributes.
Revise timestamp handling accordingly.
Preset timestamp generation.
Signed-off-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Acked-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e08d0265
...@@ -30,6 +30,9 @@ static IIO_SCAN_EL_C(in5, 5, 0, NULL); ...@@ -30,6 +30,9 @@ static IIO_SCAN_EL_C(in5, 5, 0, NULL);
static IIO_SCAN_EL_C(in6, 6, 0, NULL); static IIO_SCAN_EL_C(in6, 6, 0, NULL);
static IIO_SCAN_EL_C(in7, 7, 0, NULL); static IIO_SCAN_EL_C(in7, 7, 0, NULL);
static IIO_SCAN_EL_TIMESTAMP(8);
static IIO_CONST_ATTR_SCAN_EL_TYPE(timestamp, s, 64, 64);
static ssize_t ad7606_show_type(struct device *dev, static ssize_t ad7606_show_type(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
...@@ -60,6 +63,9 @@ static struct attribute *ad7606_scan_el_attrs[] = { ...@@ -60,6 +63,9 @@ static struct attribute *ad7606_scan_el_attrs[] = {
&iio_const_attr_in6_index.dev_attr.attr, &iio_const_attr_in6_index.dev_attr.attr,
&iio_scan_el_in7.dev_attr.attr, &iio_scan_el_in7.dev_attr.attr,
&iio_const_attr_in7_index.dev_attr.attr, &iio_const_attr_in7_index.dev_attr.attr,
&iio_const_attr_timestamp_index.dev_attr.attr,
&iio_scan_el_timestamp.dev_attr.attr,
&iio_const_attr_timestamp_type.dev_attr.attr,
&iio_dev_attr_in_type.dev_attr.attr, &iio_dev_attr_in_type.dev_attr.attr,
NULL, NULL,
}; };
...@@ -133,10 +139,14 @@ static int ad7606_ring_preenable(struct iio_dev *indio_dev) ...@@ -133,10 +139,14 @@ static int ad7606_ring_preenable(struct iio_dev *indio_dev)
size_t d_size; size_t d_size;
d_size = st->chip_info->num_channels * d_size = st->chip_info->num_channels *
st->chip_info->bits / 8 + sizeof(s64); st->chip_info->bits / 8;
if (ring->scan_timestamp) {
d_size += sizeof(s64);
if (d_size % sizeof(s64)) if (d_size % sizeof(s64))
d_size += sizeof(s64) - (d_size % sizeof(s64)); d_size += sizeof(s64) - (d_size % sizeof(s64));
}
if (ring->access.set_bytes_per_datum) if (ring->access.set_bytes_per_datum)
ring->access.set_bytes_per_datum(ring, d_size); ring->access.set_bytes_per_datum(ring, d_size);
...@@ -210,7 +220,10 @@ static void ad7606_poll_bh_to_ring(struct work_struct *work_s) ...@@ -210,7 +220,10 @@ static void ad7606_poll_bh_to_ring(struct work_struct *work_s)
} }
time_ns = iio_get_time_ns(); time_ns = iio_get_time_ns();
memcpy(buf + st->d_size - sizeof(s64), &time_ns, sizeof(time_ns));
if (ring->scan_timestamp)
memcpy(buf + st->d_size - sizeof(s64),
&time_ns, sizeof(time_ns));
ring->access.store_to(&sw_ring->buf, buf, time_ns); ring->access.store_to(&sw_ring->buf, buf, time_ns);
done: done:
...@@ -242,6 +255,7 @@ int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -242,6 +255,7 @@ int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev)
indio_dev->ring->postenable = &iio_triggered_ring_postenable; indio_dev->ring->postenable = &iio_triggered_ring_postenable;
indio_dev->ring->predisable = &iio_triggered_ring_predisable; indio_dev->ring->predisable = &iio_triggered_ring_predisable;
indio_dev->ring->scan_el_attrs = &ad7606_scan_el_group; indio_dev->ring->scan_el_attrs = &ad7606_scan_el_group;
indio_dev->ring->scan_timestamp = true ;
INIT_WORK(&st->poll_work, &ad7606_poll_bh_to_ring); INIT_WORK(&st->poll_work, &ad7606_poll_bh_to_ring);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment