aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2016-04-15 10:59:38 -0400
committerJonathan Cameron <jic23@kernel.org>2016-04-16 08:42:43 -0400
commitaf8a41271b56f6d79cb4d7c7f3ca688a2d97a801 (patch)
treeaff84a8a57ecd57040887a84013c8a709a7e151e
parent964d97bdab7d81bb65453d84ed3a51f4605a7e9c (diff)
iio:adis: Add support for manual self-test flag clear
Some variants of the devices from the ADIS family don't auto-clear the self-test bit after the self-test has completed. Instead we have to manually clear. Add support for this to the ADIS library. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r--drivers/iio/imu/adis.c7
-rw-r--r--include/linux/iio/imu/adis.h1
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/iio/imu/adis.c b/drivers/iio/imu/adis.c
index 911255d41c1a..ad6f91d06185 100644
--- a/drivers/iio/imu/adis.c
+++ b/drivers/iio/imu/adis.c
@@ -324,7 +324,12 @@ static int adis_self_test(struct adis *adis)
324 324
325 msleep(adis->data->startup_delay); 325 msleep(adis->data->startup_delay);
326 326
327 return adis_check_status(adis); 327 ret = adis_check_status(adis);
328
329 if (adis->data->self_test_no_autoclear)
330 adis_write_reg_16(adis, adis->data->msc_ctrl_reg, 0x00);
331
332 return ret;
328} 333}
329 334
330/** 335/**
diff --git a/include/linux/iio/imu/adis.h b/include/linux/iio/imu/adis.h
index fa2d01ef8f55..360da7d18a3d 100644
--- a/include/linux/iio/imu/adis.h
+++ b/include/linux/iio/imu/adis.h
@@ -41,6 +41,7 @@ struct adis_data {
41 unsigned int diag_stat_reg; 41 unsigned int diag_stat_reg;
42 42
43 unsigned int self_test_mask; 43 unsigned int self_test_mask;
44 bool self_test_no_autoclear;
44 unsigned int startup_delay; 45 unsigned int startup_delay;
45 46
46 const char * const *status_error_msgs; 47 const char * const *status_error_msgs;