renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 05:34:00 +08:00
Code

iio: imu: st_lsm6dsx: add addr/max_word_len to st_lsm6dsx_read_block()

Browse Source 
Add reg addr and max_word_len parameters to st_lsm6dsx_read_block
since LSM6DSO will use a different register address to read samples
from the FIFO and a different sample len

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Lorenzo Bianconi 2018-08-30 22:52:57 +02:00 committed by Jonathan Cameron
parent 54a6d0c688
commit 5b3c87fd92
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
View File

@ -254,18 +254,18 @@ static int st_lsm6dsx_reset_hw_ts(struct st_lsm6dsx_hw *hw)
* Set max bulk read to ST_LSM6DSX_MAX_WORD_LEN in order to avoid * Set max bulk read to ST_LSM6DSX_MAX_WORD_LEN in order to avoid
* a kmalloc for each bus access * a kmalloc for each bus access
*/ */
static inline int st_lsm6dsx_read_block(struct st_lsm6dsx_hw *hw, u8 *data, static inline int st_lsm6dsx_read_block(struct st_lsm6dsx_hw *hw, u8 addr,
unsigned int data_len) u8 *data, unsigned int data_len,
unsigned int max_word_len)
{ {
unsigned int word_len, read_len = 0; unsigned int word_len, read_len = 0;
int err; int err;
while (read_len < data_len) { while (read_len < data_len) {
word_len = min_t(unsigned int, data_len - read_len, word_len = min_t(unsigned int, data_len - read_len,
ST_LSM6DSX_MAX_WORD_LEN); max_word_len);
err = regmap_bulk_read(hw->regmap, err = regmap_bulk_read(hw->regmap, addr, data + read_len,
ST_LSM6DSX_REG_FIFO_OUTL_ADDR, word_len);
data + read_len, word_len);
if (err < 0) if (err < 0)
return err; return err;
read_len += word_len; read_len += word_len;
@ -315,7 +315,9 @@ int st_lsm6dsx_read_fifo(struct st_lsm6dsx_hw *hw)
gyro_sensor = iio_priv(hw->iio_devs[ST_LSM6DSX_ID_GYRO]); gyro_sensor = iio_priv(hw->iio_devs[ST_LSM6DSX_ID_GYRO]);
for (read_len = 0; read_len < fifo_len; read_len += pattern_len) { for (read_len = 0; read_len < fifo_len; read_len += pattern_len) {
err = st_lsm6dsx_read_block(hw, hw->buff, pattern_len); err = st_lsm6dsx_read_block(hw, ST_LSM6DSX_REG_FIFO_OUTL_ADDR,
hw->buff, pattern_len,
ST_LSM6DSX_MAX_WORD_LEN);
if (err < 0) { if (err < 0) {
dev_err(hw->dev, dev_err(hw->dev,
"failed to read pattern from fifo (err=%d)\n", "failed to read pattern from fifo (err=%d)\n",