UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Lorenzo Bianconi 2019-12-14 17:52:56 +01:00 committed by Jonathan Cameron
parent 007f2ebbac
commit 3a43195745
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
View File

@ -189,7 +189,11 @@ struct st_lsm6dsx_shub_settings {
u8 addr; u8 addr;
u8 mask; u8 mask;
} master_en; } 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 aux_sens;
struct st_lsm6dsx_reg wr_once; struct st_lsm6dsx_reg wr_once;
u8 num_ext_dev; u8 num_ext_dev;

13
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
View File

@ -873,6 +873,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.mask = BIT(2), .mask = BIT(2),
}, },
.pullup_en = { .pullup_en = {
.sec_page = true,
.addr = 0x14, .addr = 0x14,
.mask = BIT(3), .mask = BIT(3),
}, },
@ -1249,6 +1250,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.mask = BIT(2), .mask = BIT(2),
}, },
.pullup_en = { .pullup_en = {
.sec_page = true,
.addr = 0x14, .addr = 0x14,
.mask = BIT(3), .mask = BIT(3),
}, },
@ -1864,16 +1866,19 @@ static int st_lsm6dsx_init_shub(struct st_lsm6dsx_hw *hw)
pdata = (struct st_sensors_platform_data *)dev->platform_data; pdata = (struct st_sensors_platform_data *)dev->platform_data;
if ((dev_fwnode(dev) && device_property_read_bool(dev, "st,pullups")) || if ((dev_fwnode(dev) && device_property_read_bool(dev, "st,pullups")) ||
(pdata && pdata->pullups)) { (pdata && pdata->pullups)) {
err = st_lsm6dsx_set_page(hw, true); if (hub_settings->pullup_en.sec_page) {
if (err < 0) err = st_lsm6dsx_set_page(hw, true);
return err; if (err < 0)
return err;
}
data = ST_LSM6DSX_SHIFT_VAL(1, hub_settings->pullup_en.mask); data = ST_LSM6DSX_SHIFT_VAL(1, hub_settings->pullup_en.mask);
err = regmap_update_bits(hw->regmap, err = regmap_update_bits(hw->regmap,
hub_settings->pullup_en.addr, hub_settings->pullup_en.addr,
hub_settings->pullup_en.mask, data); hub_settings->pullup_en.mask, data);
st_lsm6dsx_set_page(hw, false); if (hub_settings->pullup_en.sec_page)
st_lsm6dsx_set_page(hw, false);
if (err < 0) if (err < 0)
return err; return err;