hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/drivers/iio/accel/adis16201.c
....@@ -1,9 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
12 /*
23 * ADIS16201 Dual-Axis Digital Inclinometer and Accelerometer
34 *
45 * Copyright 2010 Analog Devices Inc.
5
- *
6
- * Licensed under the GPL-2 or later.
76 */
87
98 #include <linux/device.h>
....@@ -71,7 +70,7 @@
7170 #define ADIS16201_DIAG_STAT_FLASH_UPT_FAIL_BIT 2
7271 /* Power supply above 3.625 V */
7372 #define ADIS16201_DIAG_STAT_POWER_HIGH_BIT 1
74
-/* Power supply below 3.15 V */
73
+/* Power supply below 2.975 V */
7574 #define ADIS16201_DIAG_STAT_POWER_LOW_BIT 0
7675
7776 /* System Command Register Definition */
....@@ -231,7 +230,13 @@
231230 [ADIS16201_DIAG_STAT_SPI_FAIL_BIT] = "SPI failure",
232231 [ADIS16201_DIAG_STAT_FLASH_UPT_FAIL_BIT] = "Flash update failed",
233232 [ADIS16201_DIAG_STAT_POWER_HIGH_BIT] = "Power supply above 3.625V",
234
- [ADIS16201_DIAG_STAT_POWER_LOW_BIT] = "Power supply below 3.15V",
233
+ [ADIS16201_DIAG_STAT_POWER_LOW_BIT] = "Power supply below 2.975V",
234
+};
235
+
236
+static const struct adis_timeout adis16201_timeouts = {
237
+ .reset_ms = ADIS16201_STARTUP_DELAY_MS,
238
+ .sw_reset_ms = ADIS16201_STARTUP_DELAY_MS,
239
+ .self_test_ms = ADIS16201_STARTUP_DELAY_MS,
235240 };
236241
237242 static const struct adis_data adis16201_data = {
....@@ -241,8 +246,9 @@
241246 .diag_stat_reg = ADIS16201_DIAG_STAT_REG,
242247
243248 .self_test_mask = ADIS16201_MSC_CTRL_SELF_TEST_EN,
249
+ .self_test_reg = ADIS16201_MSC_CTRL_REG,
244250 .self_test_no_autoclear = true,
245
- .startup_delay = ADIS16201_STARTUP_DELAY_MS,
251
+ .timeouts = &adis16201_timeouts,
246252
247253 .status_error_msgs = adis16201_status_error_msgs,
248254 .status_error_mask = BIT(ADIS16201_DIAG_STAT_SPI_FAIL_BIT) |
....@@ -265,7 +271,6 @@
265271 spi_set_drvdata(spi, indio_dev);
266272
267273 indio_dev->name = spi->dev.driver->name;
268
- indio_dev->dev.parent = &spi->dev;
269274 indio_dev->info = &adis16201_info;
270275
271276 indio_dev->channels = adis16201_channels;
....@@ -276,34 +281,15 @@
276281 if (ret)
277282 return ret;
278283
279
- ret = adis_setup_buffer_and_trigger(st, indio_dev, NULL);
284
+ ret = devm_adis_setup_buffer_and_trigger(st, indio_dev, NULL);
280285 if (ret)
281286 return ret;
282287
283288 ret = adis_initial_startup(st);
284289 if (ret)
285
- goto error_cleanup_buffer_trigger;
290
+ return ret;
286291
287
- ret = iio_device_register(indio_dev);
288
- if (ret < 0)
289
- goto error_cleanup_buffer_trigger;
290
-
291
- return 0;
292
-
293
-error_cleanup_buffer_trigger:
294
- adis_cleanup_buffer_and_trigger(st, indio_dev);
295
- return ret;
296
-}
297
-
298
-static int adis16201_remove(struct spi_device *spi)
299
-{
300
- struct iio_dev *indio_dev = spi_get_drvdata(spi);
301
- struct adis *st = iio_priv(indio_dev);
302
-
303
- iio_device_unregister(indio_dev);
304
- adis_cleanup_buffer_and_trigger(st, indio_dev);
305
-
306
- return 0;
292
+ return devm_iio_device_register(&spi->dev, indio_dev);
307293 }
308294
309295 static struct spi_driver adis16201_driver = {
....@@ -311,7 +297,6 @@
311297 .name = "adis16201",
312298 },
313299 .probe = adis16201_probe,
314
- .remove = adis16201_remove,
315300 };
316301 module_spi_driver(adis16201_driver);
317302
....@@ -319,3 +304,4 @@
319304 MODULE_DESCRIPTION("Analog Devices ADIS16201 Dual-Axis Digital Inclinometer and Accelerometer");
320305 MODULE_LICENSE("GPL v2");
321306 MODULE_ALIAS("spi:adis16201");
307
+MODULE_IMPORT_NS(IIO_ADISLIB);