Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17623d9a authored by Jean-Baptiste Maneyrol's avatar Jean-Baptiste Maneyrol Committed by Jonathan Cameron
Browse files

iio: imu: inv_mpu6050: use set_power_itg function in i2c mux 



Set power function is rewritten manually inside i2c mux select.
Better use the already identical existing function.

Signed-off-by: default avatarJean-Baptiste Maneyrol <jmaneyrol@invensense.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 7fc01685

drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c

+13 −20
Original line number Original line Diff line number Diff line
@@ -29,25 +29,19 @@ static int inv_mpu6050_select_bypass(struct i2c_mux_core *muxc, u32 chan_id) 
{

{

	struct iio_dev *indio_dev = i2c_mux_priv(muxc);

	struct iio_dev *indio_dev = i2c_mux_priv(muxc);

	struct inv_mpu6050_state *st = iio_priv(indio_dev);

	struct inv_mpu6050_state *st = iio_priv(indio_dev);

	int ret = 0;

	int ret;





	/* Use the same mutex which was used everywhere to protect power-op */

	mutex_lock(&st->lock);

	mutex_lock(&st->lock);

	if (!st->powerup_count) {



		ret = regmap_write(st->map, st->reg->pwr_mgmt_1, 0);

	ret = inv_mpu6050_set_power_itg(st, true);

	if (ret)

	if (ret)

			goto write_error;

		goto error_unlock;





		usleep_range(INV_MPU6050_REG_UP_TIME_MIN,

			     INV_MPU6050_REG_UP_TIME_MAX);

	}

	if (!ret) {

		st->powerup_count++;

	ret = regmap_write(st->map, st->reg->int_pin_cfg,

	ret = regmap_write(st->map, st->reg->int_pin_cfg,

			   INV_MPU6050_INT_PIN_CFG |

			   INV_MPU6050_INT_PIN_CFG |

			   INV_MPU6050_BIT_BYPASS_EN);

			   INV_MPU6050_BIT_BYPASS_EN);

	}



write_error:

error_unlock:

	mutex_unlock(&st->lock);

	mutex_unlock(&st->lock);





	return ret;

	return ret;
@@ -59,12 +53,11 @@ static int inv_mpu6050_deselect_bypass(struct i2c_mux_core *muxc, u32 chan_id) 
	struct inv_mpu6050_state *st = iio_priv(indio_dev);

	struct inv_mpu6050_state *st = iio_priv(indio_dev);





	mutex_lock(&st->lock);

	mutex_lock(&st->lock);



	/* It doesn't really mattter, if any of the calls fails */

	/* It doesn't really mattter, if any of the calls fails */

	regmap_write(st->map, st->reg->int_pin_cfg, INV_MPU6050_INT_PIN_CFG);

	regmap_write(st->map, st->reg->int_pin_cfg, INV_MPU6050_INT_PIN_CFG);

	st->powerup_count--;

	inv_mpu6050_set_power_itg(st, false);

	if (!st->powerup_count)



		regmap_write(st->map, st->reg->pwr_mgmt_1,

			     INV_MPU6050_BIT_SLEEP);

	mutex_unlock(&st->lock);

	mutex_unlock(&st->lock);





	return 0;

	return 0;