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

[linux-2.6-microblaze.git] / drivers / iio / imu / adis16460.c

diff --git a/drivers/iio/imu/adis16460.c b/drivers/iio/imu/adis16460.c
index b558125..9539cfe 100644 (file)
--- a/drivers/iio/imu/adis16460.c
+++ b/drivers/iio/imu/adis16460.c
@@ -383,6 +383,12 @@ static const char * const adis16460_status_error_msgs[] = {
        [ADIS16460_DIAG_STAT_FLASH_UPT] = "Flash update failure",
 };
 
+static const struct adis_timeout adis16460_timeouts = {
+       .reset_ms = 225,
+       .sw_reset_ms = 225,
+       .self_test_ms = 10,
+};
+
 static const struct adis_data adis16460_data = {
        .diag_stat_reg = ADIS16460_REG_DIAG_STAT,
        .glob_cmd_reg = ADIS16460_REG_GLOB_CMD,
@@ -398,6 +404,7 @@ static const struct adis_data adis16460_data = {
                BIT(ADIS16460_DIAG_STAT_SPI_COMM) |
                BIT(ADIS16460_DIAG_STAT_FLASH_UPT),
        .enable_irq = adis16460_enable_irq,
+       .timeouts = &adis16460_timeouts,
 };
 
 static int adis16460_probe(struct spi_device *spi)