]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
iio: imu: adis: Add DIAG_STAT register
authorRobert Budai <robert.budai@analog.com>
Mon, 17 Feb 2025 10:57:47 +0000 (12:57 +0200)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sat, 22 Feb 2025 12:23:49 +0000 (12:23 +0000)
Some devices may have more than 16 bits of status. This patch allows the
user to specify the size of the DIAG_STAT register. It defaults to 2 if
not specified. This is mainly for backward compatibility.

Co-developed-by: Ramona Gradinariu <ramona.gradinariu@analog.com>
Signed-off-by: Ramona Gradinariu <ramona.gradinariu@analog.com>
Co-developed-by: Antoniu Miclaus <antoniu.miclaus@analog.com>
Signed-off-by: Antoniu Miclaus <antoniu.miclaus@analog.com>
Co-developed-by: Nuno Sá <nuno.sa@analog.com>
Signed-off-by: Nuno Sá <nuno.sa@analog.com>
Signed-off-by: Robert Budai <robert.budai@analog.com>
Link: https://patch.msgid.link/20250217105753.605465-4-robert.budai@analog.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/imu/adis.c
include/linux/iio/imu/adis.h

index 84344f052fb748c82368563cf645d57d6065f8ca..1c646c36aeb1997fb3e276974af687695a9d5dfd 100644 (file)
@@ -304,11 +304,20 @@ EXPORT_SYMBOL_NS(__adis_enable_irq, "IIO_ADISLIB");
  */
 int __adis_check_status(struct adis *adis)
 {
-       u16 status;
+       unsigned int status;
+       int diag_stat_bits;
+       u16 status_16;
        int ret;
        int i;
 
-       ret = __adis_read_reg_16(adis, adis->data->diag_stat_reg, &status);
+       if (adis->data->diag_stat_size) {
+               ret = adis->ops->read(adis, adis->data->diag_stat_reg, &status,
+                                     adis->data->diag_stat_size);
+       } else {
+               ret = __adis_read_reg_16(adis, adis->data->diag_stat_reg,
+                                        &status_16);
+               status = status_16;
+       }
        if (ret)
                return ret;
 
@@ -317,7 +326,10 @@ int __adis_check_status(struct adis *adis)
        if (status == 0)
                return 0;
 
-       for (i = 0; i < 16; ++i) {
+       diag_stat_bits = BITS_PER_BYTE * (adis->data->diag_stat_size ?
+                                         adis->data->diag_stat_size : 2);
+
+       for (i = 0; i < diag_stat_bits; ++i) {
                if (status & BIT(i)) {
                        dev_err(&adis->spi->dev, "%s.\n",
                                adis->data->status_error_msgs[i]);
index 52652f51db2ef3bd2ab9533b5c2ebc9024e740ee..aa160511e2656e7bcff875db993700f1e3900245 100644 (file)
@@ -44,6 +44,8 @@ struct adis_timeout {
  * @glob_cmd_reg: Register address of the GLOB_CMD register
  * @msc_ctrl_reg: Register address of the MSC_CTRL register
  * @diag_stat_reg: Register address of the DIAG_STAT register
+ * @diag_stat_size:    Length (in bytes) of the DIAG_STAT register. If 0 the
+ *                     default length is 2 bytes long.
  * @prod_id_reg: Register address of the PROD_ID register
  * @prod_id: Product ID code that should be expected when reading @prod_id_reg
  * @self_test_mask: Bitmask of supported self-test operations
@@ -70,6 +72,7 @@ struct adis_data {
        unsigned int glob_cmd_reg;
        unsigned int msc_ctrl_reg;
        unsigned int diag_stat_reg;
+       unsigned int diag_stat_size;
        unsigned int prod_id_reg;
 
        unsigned int prod_id;