|
@@ -22,6 +22,7 @@
|
|
|
#include <linux/interrupt.h>
|
|
|
#include <linux/irq.h>
|
|
|
#include <linux/slab.h>
|
|
|
+#include <linux/delay.h>
|
|
|
#include <linux/hid-sensor-hub.h>
|
|
|
#include <linux/iio/iio.h>
|
|
|
#include <linux/iio/sysfs.h>
|
|
@@ -60,6 +61,7 @@ static const struct iio_chan_spec magn_3d_channels[] = {
|
|
|
.type = IIO_MAGN,
|
|
|
.modified = 1,
|
|
|
.channel2 = IIO_MOD_X,
|
|
|
+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
|
|
|
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |
|
|
|
BIT(IIO_CHAN_INFO_SCALE) |
|
|
|
BIT(IIO_CHAN_INFO_SAMP_FREQ) |
|
|
@@ -69,6 +71,7 @@ static const struct iio_chan_spec magn_3d_channels[] = {
|
|
|
.type = IIO_MAGN,
|
|
|
.modified = 1,
|
|
|
.channel2 = IIO_MOD_Y,
|
|
|
+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
|
|
|
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |
|
|
|
BIT(IIO_CHAN_INFO_SCALE) |
|
|
|
BIT(IIO_CHAN_INFO_SAMP_FREQ) |
|
|
@@ -78,6 +81,7 @@ static const struct iio_chan_spec magn_3d_channels[] = {
|
|
|
.type = IIO_MAGN,
|
|
|
.modified = 1,
|
|
|
.channel2 = IIO_MOD_Z,
|
|
|
+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
|
|
|
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |
|
|
|
BIT(IIO_CHAN_INFO_SCALE) |
|
|
|
BIT(IIO_CHAN_INFO_SAMP_FREQ) |
|
|
@@ -108,11 +112,20 @@ static int magn_3d_read_raw(struct iio_dev *indio_dev,
|
|
|
u32 address;
|
|
|
int ret;
|
|
|
int ret_type;
|
|
|
+ s32 poll_value;
|
|
|
|
|
|
*val = 0;
|
|
|
*val2 = 0;
|
|
|
switch (mask) {
|
|
|
case 0:
|
|
|
+ poll_value = hid_sensor_read_poll_value(
|
|
|
+ &magn_state->common_attributes);
|
|
|
+ if (poll_value < 0)
|
|
|
+ return -EINVAL;
|
|
|
+
|
|
|
+ hid_sensor_power_state(&magn_state->common_attributes, true);
|
|
|
+ msleep_interruptible(poll_value * 2);
|
|
|
+
|
|
|
report_id =
|
|
|
magn_state->magn[chan->scan_index].report_id;
|
|
|
address = magn_3d_addresses[chan->scan_index];
|
|
@@ -123,8 +136,11 @@ static int magn_3d_read_raw(struct iio_dev *indio_dev,
|
|
|
report_id);
|
|
|
else {
|
|
|
*val = 0;
|
|
|
+ hid_sensor_power_state(&magn_state->common_attributes,
|
|
|
+ false);
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
+ hid_sensor_power_state(&magn_state->common_attributes, false);
|
|
|
ret_type = IIO_VAL_INT;
|
|
|
break;
|
|
|
case IIO_CHAN_INFO_SCALE:
|