Commit a45d1238 authored by Richard Tresidder's avatar Richard Tresidder Committed by Jonathan Cameron
Browse files

iio: accell: mma8452: Reduce sleep time when data not ready 



Modified the sleep method when data is not ready to allow for sampling > 50sps to work.

Signed-off-by: default avatarRichard Tresidder <rtresidd@electromag.com.au>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 2a864877

drivers/iio/accel/mma8452.c

+23 −1
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ struct mma8452_data { 
	u8 ctrl_reg1;

	u8 data_cfg;

	const struct mma_chip_info *chip_info;

	int sleep_val;

};



 /**
@@ -193,6 +194,10 @@ static int mma8452_drdy(struct mma8452_data *data) 
		if ((ret & MMA8452_STATUS_DRDY) == MMA8452_STATUS_DRDY)

			return 0;



		if (data->sleep_val <= 20)

			usleep_range(data->sleep_val * 250,

				     data->sleep_val * 500);

		else

			msleep(20);

	}
@@ -544,6 +549,18 @@ static int mma8452_read_raw(struct iio_dev *indio_dev, 
	return -EINVAL;

}



static int mma8452_calculate_sleep(struct mma8452_data *data)

{

	int ret, i = mma8452_get_odr_index(data);



	if (mma8452_samp_freq[i][0] > 0)

		ret = 1000 / mma8452_samp_freq[i][0];

	else

		ret = 1000;



	return ret == 0 ? 1 : ret;

}



static int mma8452_standby(struct mma8452_data *data)

{

	return i2c_smbus_write_byte_data(data->client, MMA8452_CTRL_REG1,
@@ -700,6 +717,8 @@ static int mma8452_write_raw(struct iio_dev *indio_dev, 
		data->ctrl_reg1 &= ~MMA8452_CTRL_DR_MASK;

		data->ctrl_reg1 |= i << MMA8452_CTRL_DR_SHIFT;



		data->sleep_val = mma8452_calculate_sleep(data);



		ret = mma8452_change_config(data, MMA8452_CTRL_REG1,

					    data->ctrl_reg1);

		break;
@@ -1593,6 +1612,9 @@ static int mma8452_probe(struct i2c_client *client, 


	data->ctrl_reg1 = MMA8452_CTRL_ACTIVE |

			  (MMA8452_CTRL_DR_DEFAULT << MMA8452_CTRL_DR_SHIFT);



	data->sleep_val = mma8452_calculate_sleep(data);



	ret = i2c_smbus_write_byte_data(client, MMA8452_CTRL_REG1,

					data->ctrl_reg1);

	if (ret < 0)