This patch allows the custom definition of reset funcitonality
for adis object. It is useful in cases where the reset does not
need to sleep after the reset since it is handled by the library.
Co-developed-by: Ramona Gradinariu <ramona.gradinariu@xxxxxxxxxx>
Signed-off-by: Ramona Gradinariu <ramona.gradinariu@xxxxxxxxxx>
Co-developed-by: Antoniu Miclaus <antoniu.miclaus@xxxxxxxxxx>
Signed-off-by: Antoniu Miclaus <antoniu.miclaus@xxxxxxxxxx>
Signed-off-by: Nuno Sá <nuno.sa@xxxxxxxxxx>
Signed-off-by: Robert Budai <robert.budai@xxxxxxxxxx>
---
v3:
- added reset to default ops and used the allowed custom ops definition in case all read/write and reset are defined
drivers/iio/imu/adis.c | 7 ++++---
include/linux/iio/imu/adis.h | 3 +++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/iio/imu/adis.c b/drivers/iio/imu/adis.c
index 54915c7a3e76..9e4113473dc4 100644
--- a/drivers/iio/imu/adis.c
+++ b/drivers/iio/imu/adis.c
@@ -340,7 +340,7 @@ int __adis_reset(struct adis *adis)
const struct adis_timeout *timeouts = adis->data->timeouts;
ret = __adis_write_reg_8(adis, adis->data->glob_cmd_reg,
- ADIS_GLOB_CMD_SW_RESET);
+ ADIS_GLOB_CMD_SW_RESET);
if (ret) {
dev_err(&adis->spi->dev, "Failed to reset device: %d\n", ret);
return ret;
@@ -491,6 +491,7 @@ EXPORT_SYMBOL_NS_GPL(adis_single_conversion, "IIO_ADISLIB");
static const struct adis_ops adis_default_ops = {
.read = __adis_read_reg,
.write = __adis_write_reg,
+ .reset = __adis_reset,
};
/**
@@ -522,9 +523,9 @@ int adis_init(struct adis *adis, struct iio_dev *indio_dev,
adis->spi = spi;
adis->data = data;
- if (!adis->ops->write && !adis->ops->read)
+ if (!adis->ops->write && !adis->ops->read && !adis->ops->reset)
adis->ops = &adis_default_ops;
- else if (!adis->ops->write || !adis->ops->read)
+ else if (!adis->ops->write || !adis->ops->read || !adis->ops->reset)
return -EINVAL;
iio_device_set_drvdata(indio_dev, adis);
diff --git a/include/linux/iio/imu/adis.h b/include/linux/iio/imu/adis.h
index 89cfa75ae9ea..52652f51db2e 100644
--- a/include/linux/iio/imu/adis.h
+++ b/include/linux/iio/imu/adis.h
@@ -98,12 +98,15 @@ struct adis_data {
* struct adis_ops: Custom ops for adis devices.
* @write: Custom spi write implementation.
* @read: Custom spi read implementation.
+ * @reset: Custom sw reset implementation. The custom implementation does not
+ * need to sleep after the reset. It's done by the library already.
*/
struct adis_ops {
int (*write)(struct adis *adis, unsigned int reg, unsigned int value,
unsigned int size);
int (*read)(struct adis *adis, unsigned int reg, unsigned int *value,
unsigned int size);
+ int (*reset)(struct adis *adis);
};
/**
--
2.34.1
