Commit 5b8343e0 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Jonathan Cameron
Browse files

iio: imu: st_lsm6dsx: check if shub_output reg is located in primary page 



Check if the sensor hub output register is located in the primary or in the
secondary memory page. This is a preliminary patch to support i2c master
controller on lsm6dsm devices

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 3a431957

drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h

+4 −1
Original line number Diff line number Diff line
@@ -197,7 +197,10 @@ struct st_lsm6dsx_shub_settings { 
	struct st_lsm6dsx_reg aux_sens;

	struct st_lsm6dsx_reg wr_once;

	u8 num_ext_dev;

	u8 shub_out;

	struct {

		bool sec_page;

		u8 addr;

	} shub_out;

	u8 slv0_addr;

	u8 dw_slv0_addr;

	u8 batch_en;

drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c

+8 −2
Original line number Diff line number Diff line
@@ -886,7 +886,10 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { 
				.mask = BIT(6),

			},

			.num_ext_dev = 3,

			.shub_out = 0x02,

			.shub_out = {

				.sec_page = true,

				.addr = 0x02,

			},

			.slv0_addr = 0x15,

			.dw_slv0_addr = 0x21,

			.batch_en = BIT(3),
@@ -1263,7 +1266,10 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { 
				.mask = BIT(6),

			},

			.num_ext_dev = 3,

			.shub_out = 0x02,

			.shub_out = {

				.sec_page = true,

				.addr = 0x02,

			},

			.slv0_addr = 0x15,

			.dw_slv0_addr = 0x21,

			.batch_en = BIT(3),

drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c

+16 −12
Original line number Diff line number Diff line
@@ -105,19 +105,26 @@ static void st_lsm6dsx_shub_wait_complete(struct st_lsm6dsx_hw *hw) 
 *

 * Read st_lsm6dsx i2c controller register

 */

static int st_lsm6dsx_shub_read_reg(struct st_lsm6dsx_hw *hw, u8 addr,

				    u8 *data, int len)

static int

st_lsm6dsx_shub_read_reg(struct st_lsm6dsx_hw *hw, u8 *data,

			 int len)

{

	const struct st_lsm6dsx_shub_settings *hub_settings;

	int err;



	mutex_lock(&hw->page_lock);



	hub_settings = &hw->settings->shub_settings;

	if (hub_settings->shub_out.sec_page) {

		err = st_lsm6dsx_set_page(hw, true);

		if (err < 0)

			goto out;

	}



	err = regmap_bulk_read(hw->regmap, addr, data, len);

	err = regmap_bulk_read(hw->regmap, hub_settings->shub_out.addr,

			       data, len);



	if (hub_settings->shub_out.sec_page)

		st_lsm6dsx_set_page(hw, false);

out:

	mutex_unlock(&hw->page_lock);
@@ -236,8 +243,7 @@ st_lsm6dsx_shub_read(struct st_lsm6dsx_sensor *sensor, u8 addr, 


	st_lsm6dsx_shub_wait_complete(hw);



	err = st_lsm6dsx_shub_read_reg(hw, hub_settings->shub_out, data,

				       len & ST_LS6DSX_READ_OP_MASK);

	err = st_lsm6dsx_shub_read_reg(hw, data, len & ST_LS6DSX_READ_OP_MASK);



	st_lsm6dsx_shub_master_enable(sensor, false);
@@ -719,9 +725,7 @@ st_lsm6dsx_shub_check_wai(struct st_lsm6dsx_hw *hw, u8 *i2c_addr, 


		st_lsm6dsx_shub_wait_complete(hw);



		err = st_lsm6dsx_shub_read_reg(hw,

					       hub_settings->shub_out,

					       &data, sizeof(data));

		err = st_lsm6dsx_shub_read_reg(hw, &data, sizeof(data));



		st_lsm6dsx_shub_master_enable(sensor, false);

CRA Git | Maintained and supported by SUSTech CRA and CCSE