When flushing the hw fifo there is a bug in the I2C that prevents burst
reads of more than one sample pair.
Signed-off-by: Sean Nyekjaer <sean@xxxxxxxxxx>
---
This series depends on "iio: accel: add support for
FXLS8962AF/FXLS8964AF accelerometers"
drivers/iio/accel/fxls8962af-core.c | 27 +++++++++++++++++++++++----
drivers/iio/accel/fxls8962af-i2c.c | 2 +-
drivers/iio/accel/fxls8962af-spi.c | 2 +-
drivers/iio/accel/fxls8962af.h | 2 +-
4 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/drivers/iio/accel/fxls8962af-core.c b/drivers/iio/accel/fxls8962af-core.c
index 2bd5c6d76b63..fad9e756d313 100644
--- a/drivers/iio/accel/fxls8962af-core.c
+++ b/drivers/iio/accel/fxls8962af-core.c
@@ -149,6 +149,7 @@ struct fxls8962af_data {
__le16 channels[3];
s64 ts __aligned(8);
} scan;
+ bool i2c_device;
int64_t timestamp, old_timestamp; /* Only used in hw fifo mode. */
struct iio_mount_matrix orientation;
};
@@ -684,11 +685,27 @@ static int fxls8962af_fifo_transfer(struct fxls8962af_data *data,
{
struct device *dev = regmap_get_device(data->regmap);
int sample_length = 3 * 2;
- int ret;
+ int ret, i;
int total_length = samples * sample_length;
- ret = regmap_raw_read(data->regmap, FXLS8962AF_BUF_X_LSB, buffer,
- total_length);
+ if (data->i2c_device) {
+ /* Due to errata bug:
+ * E3: FIFO burst read operation error using I2C interface
+ * We have to avoid burst reads on I2C..
+ */
+ for (i = 0; i < samples; i++) {
+ ret = regmap_raw_read(data->regmap, FXLS8962AF_BUF_X_LSB,
+ &buffer[i * sample_length],
+ sample_length);
+ if (ret < 0)
+ goto out;
+ }
+ } else {
+ ret = regmap_raw_read(data->regmap, FXLS8962AF_BUF_X_LSB, buffer,
+ total_length);
+ }
+
+ out:
if (ret < 0)
dev_err(dev, "Error transferring data from fifo: %d\n", ret);
@@ -899,7 +916,8 @@ static int fxls8962af_irq_setup(struct iio_dev *indio_dev, int irq)
return ret;
}
-int fxls8962af_core_probe(struct device *dev, struct regmap *regmap, int irq)
+int fxls8962af_core_probe(struct device *dev, struct regmap *regmap, int irq,
+ bool i2c_device)
{
struct fxls8962af_data *data;
struct iio_dev *indio_dev;
@@ -913,6 +931,7 @@ int fxls8962af_core_probe(struct device *dev, struct regmap *regmap, int irq)
data = iio_priv(indio_dev);
dev_set_drvdata(dev, indio_dev);
data->regmap = regmap;
+ data->i2c_device = i2c_device;
ret = iio_read_mount_matrix(dev, "mount-matrix", &data->orientation);
if (ret)
diff --git a/drivers/iio/accel/fxls8962af-i2c.c b/drivers/iio/accel/fxls8962af-i2c.c
index cba12160a714..03bd7ef285d0 100644
--- a/drivers/iio/accel/fxls8962af-i2c.c
+++ b/drivers/iio/accel/fxls8962af-i2c.c
@@ -24,7 +24,7 @@ static int fxls8962af_probe(struct i2c_client *client)
return PTR_ERR(regmap);
}
- return fxls8962af_core_probe(&client->dev, regmap, client->irq);
+ return fxls8962af_core_probe(&client->dev, regmap, client->irq, true);
}
static const struct i2c_device_id fxls8962af_id[] = {
diff --git a/drivers/iio/accel/fxls8962af-spi.c b/drivers/iio/accel/fxls8962af-spi.c
index cb971b76d135..77186220f6dc 100644
--- a/drivers/iio/accel/fxls8962af-spi.c
+++ b/drivers/iio/accel/fxls8962af-spi.c
@@ -24,7 +24,7 @@ static int fxls8962af_probe(struct spi_device *spi)
return PTR_ERR(regmap);
}
- return fxls8962af_core_probe(&spi->dev, regmap, spi->irq);
+ return fxls8962af_core_probe(&spi->dev, regmap, spi->irq, false);
}
static const struct of_device_id fxls8962af_spi_of_match[] = {
diff --git a/drivers/iio/accel/fxls8962af.h b/drivers/iio/accel/fxls8962af.h
index b67572c3ef06..e428163926b7 100644
--- a/drivers/iio/accel/fxls8962af.h
+++ b/drivers/iio/accel/fxls8962af.h
@@ -13,7 +13,7 @@ enum {
fxls8964af,
};
-int fxls8962af_core_probe(struct device *dev, struct regmap *regmap, int irq);
+int fxls8962af_core_probe(struct device *dev, struct regmap *regmap, int irq, bool i2c_device);
int fxls8962af_core_remove(struct device *dev);
extern const struct dev_pm_ops fxls8962af_pm_ops;
--
2.31.0
