Merge tag 'staging-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-microblaze.git] / drivers / iio / accel / adis16209.c

diff --git a/drivers/iio/accel/adis16209.c b/drivers/iio/accel/adis16209.c
index 98d77af..c6dbd24 100644 (file)
--- a/drivers/iio/accel/adis16209.c
+++ b/drivers/iio/accel/adis16209.c
@@ -243,6 +243,12 @@ static const char * const adis16209_status_error_msgs[] = {
        [ADIS16209_STAT_POWER_LOW_BIT] = "Power supply below 2.975V",
 };
 
+static const struct adis_timeout adis16209_timeouts = {
+       .reset_ms = ADIS16209_STARTUP_DELAY_MS,
+       .self_test_ms = ADIS16209_STARTUP_DELAY_MS,
+       .sw_reset_ms = ADIS16209_STARTUP_DELAY_MS,
+};
+
 static const struct adis_data adis16209_data = {
        .read_delay = 30,
        .msc_ctrl_reg = ADIS16209_MSC_CTRL_REG,
@@ -251,7 +257,7 @@ static const struct adis_data adis16209_data = {
 
        .self_test_mask = ADIS16209_MSC_CTRL_SELF_TEST_EN,
        .self_test_no_autoclear = true,
-       .startup_delay = ADIS16209_STARTUP_DELAY_MS,
+       .timeouts = &adis16209_timeouts,
 
        .status_error_msgs = adis16209_status_error_msgs,
        .status_error_mask = BIT(ADIS16209_STAT_SELFTEST_FAIL_BIT) |