Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
iio
/
proximity
/
as3935.c
diff --git
a/kernel/drivers/iio/proximity/as3935.c
b/kernel/drivers/iio/proximity/as3935.c
index
f4d29d5
..
a0aedda
100644
(file)
--- a/
kernel/drivers/iio/proximity/as3935.c
+++ b/
kernel/drivers/iio/proximity/as3935.c
@@
-64,6
+64,7
@@
struct as3935_state {
struct delayed_work work;
u32 tune_cap;
struct delayed_work work;
u32 tune_cap;
+ u8 buffer[16]; /* 8-bit data + 56-bit padding + 64-bit timestamp */
u8 buf[2] ____cacheline_aligned;
};
u8 buf[2] ____cacheline_aligned;
};
@@
-72,7
+73,8
@@
static const struct iio_chan_spec as3935_channels[] = {
.type = IIO_PROXIMITY,
.info_mask_separate =
BIT(IIO_CHAN_INFO_RAW) |
.type = IIO_PROXIMITY,
.info_mask_separate =
BIT(IIO_CHAN_INFO_RAW) |
- BIT(IIO_CHAN_INFO_PROCESSED),
+ BIT(IIO_CHAN_INFO_PROCESSED) |
+ BIT(IIO_CHAN_INFO_SCALE),
.scan_index = 0,
.scan_type = {
.sign = 'u',
.scan_index = 0,
.scan_type = {
.sign = 'u',
@@
-181,7
+183,12
@@
static int as3935_read_raw(struct iio_dev *indio_dev,
/* storm out of range */
if (*val == AS3935_DATA_MASK)
return -EINVAL;
/* storm out of range */
if (*val == AS3935_DATA_MASK)
return -EINVAL;
- *val *= 1000;
+
+ if (m == IIO_CHAN_INFO_PROCESSED)
+ *val *= 1000;
+ break;
+ case IIO_CHAN_INFO_SCALE:
+ *val = 1000;
break;
default:
return -EINVAL;
break;
default:
return -EINVAL;
@@
-206,10
+213,10
@@
static irqreturn_t as3935_trigger_handler(int irq, void *private)
ret = as3935_read(st, AS3935_DATA, &val);
if (ret)
goto err_read;
ret = as3935_read(st, AS3935_DATA, &val);
if (ret)
goto err_read;
- val &= AS3935_DATA_MASK;
- val *= 1000;
- iio_push_to_buffers_with_timestamp(indio_dev, &val, pf->timestamp);
+ st->buffer[0] = val & AS3935_DATA_MASK;
+ iio_push_to_buffers_with_timestamp(indio_dev, &st->buffer,
+ pf->timestamp);
err_read:
iio_trigger_notify_done(indio_dev->trig);
err_read:
iio_trigger_notify_done(indio_dev->trig);
@@
-385,7
+392,7
@@
static int as3935_probe(struct spi_device *spi)
return ret;
}
return ret;
}
- ret = iio_triggered_buffer_setup(indio_dev,
NULL
,
+ ret = iio_triggered_buffer_setup(indio_dev,
iio_pollfunc_store_time
,
&as3935_trigger_handler, NULL);
if (ret) {
&as3935_trigger_handler, NULL);
if (ret) {