Commit 3a431957 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Jonathan Cameron
Browse files

iio: imu: st_lsm6dsx: check if pull_up is located in primary page 



Check if the pull up 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 007f2ebb

drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h

+5 −1
Original line number Diff line number Diff line
@@ -189,7 +189,11 @@ struct st_lsm6dsx_shub_settings { 
		u8 addr;

		u8 mask;

	} master_en;

	struct st_lsm6dsx_reg pullup_en;

	struct {

		bool sec_page;

		u8 addr;

		u8 mask;

	} pullup_en;

	struct st_lsm6dsx_reg aux_sens;

	struct st_lsm6dsx_reg wr_once;

	u8 num_ext_dev;

drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c

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

			},

			.pullup_en = {

				.sec_page = true,

				.addr = 0x14,

				.mask = BIT(3),

			},
@@ -1249,6 +1250,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { 
				.mask = BIT(2),

			},

			.pullup_en = {

				.sec_page = true,

				.addr = 0x14,

				.mask = BIT(3),

			},
@@ -1864,15 +1866,18 @@ static int st_lsm6dsx_init_shub(struct st_lsm6dsx_hw *hw) 
	pdata = (struct st_sensors_platform_data *)dev->platform_data;

	if ((dev_fwnode(dev) && device_property_read_bool(dev, "st,pullups")) ||

	    (pdata && pdata->pullups)) {

		if (hub_settings->pullup_en.sec_page) {

			err = st_lsm6dsx_set_page(hw, true);

			if (err < 0)

				return err;

		}



		data = ST_LSM6DSX_SHIFT_VAL(1, hub_settings->pullup_en.mask);

		err = regmap_update_bits(hw->regmap,

					 hub_settings->pullup_en.addr,

					 hub_settings->pullup_en.mask, data);



		if (hub_settings->pullup_en.sec_page)

			st_lsm6dsx_set_page(hw, false);



		if (err < 0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE