michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers/sensor: lis2dh: Fix multi-instance leftovers

Browse source 
Introduced two per instance booleans, which get set using DT info:

  1. is_lsm303agr_dev: if the device is a LSM303AGR_ACCEL, then
     the scale values have to be changed.

  2. Handle disconnect-sdo-sa0-pull-up if present in ntsnace DT.

Signed-off-by: Armando Visconti <armando.visconti@st.com>
This commit is contained in:
Armando Visconti 2020-11-17 13:22:08 +01:00 • committed by Maureen Helm
commit 46b12406de
2 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

29
drivers/sensor/lis2dh/lis2dh.c
View file

@ -22,18 +22,11 @@ LOG_MODULE_REGISTER(lis2dh, CONFIG_SENSOR_LOG_LEVEL);
* Use values for low-power mode in DS "Mechanical (Sensor) characteristics",
* multiplied by 100.
*/
static const uint32_t lis2dh_reg_val_to_scale[] = {
#if DT_NODE_HAS_STATUS(DT_INST(0, st_lsm303agr_accel), okay)
ACCEL_SCALE(1563),
ACCEL_SCALE(3126),
ACCEL_SCALE(6252),
ACCEL_SCALE(18758),
#else
static uint32_t lis2dh_reg_val_to_scale[] = {
ACCEL_SCALE(1600),
ACCEL_SCALE(3200),
ACCEL_SCALE(6400),
ACCEL_SCALE(19200),
#endif
};
static void lis2dh_convert(int16_t raw_val, uint32_t scale,
@ -295,7 +288,15 @@ int lis2dh_init(const struct device *dev)
return -EINVAL;
}
if (IS_ENABLED(DT_INST_PROP(0, disconnect_sdo_sa0_pull_up))) {
/* Fix LSM303AGR_ACCEL device scale values */
if (cfg->is_lsm303agr_dev) {
lis2dh_reg_val_to_scale[0] = ACCEL_SCALE(1563);
lis2dh_reg_val_to_scale[1] = ACCEL_SCALE(3126);
lis2dh_reg_val_to_scale[2] = ACCEL_SCALE(6252);
lis2dh_reg_val_to_scale[3] = ACCEL_SCALE(18758);
}
if (cfg->disc_pull_up) {
status = lis2dh->hw_tf->update_reg(dev, LIS2DH_REG_CTRL0,
LIS2DH_SDO_PU_DISC_MASK,
LIS2DH_SDO_PU_DISC_MASK);
@ -367,6 +368,12 @@ int lis2dh_init(const struct device *dev)
CONFIG_SENSOR_INIT_PRIORITY, \
&lis2dh_driver_api);
#define IS_LSM303AGR_DEV(inst) \
DT_NODE_HAS_COMPAT(DT_DRV_INST(inst), st_lsm303agr_accel)
#define DISC_PULL_UP(inst) \
DT_INST_PROP(inst, disconnect_sdo_sa0_pull_up)
/*
* Instantiation macros used when a device is on a SPI bus.
*/
@ -441,6 +448,8 @@ int lis2dh_init(const struct device *dev)
.bus_name = DT_INST_BUS_LABEL(inst), \
.bus_init = lis2dh_spi_init, \
.bus_cfg = { .spi_cfg = LIS2DH_SPI_CFG(inst) }, \
.is_lsm303agr_dev = IS_LSM303AGR_DEV(inst), \
.disc_pull_up = DISC_PULL_UP(inst), \
LIS2DH_CFG_INT(inst) \
}
@ -460,6 +469,8 @@ int lis2dh_init(const struct device *dev)
.bus_name = DT_INST_BUS_LABEL(inst), \
.bus_init = lis2dh_i2c_init, \
.bus_cfg = { .i2c_slv_addr = DT_INST_REG_ADDR(inst), }, \
.is_lsm303agr_dev = IS_LSM303AGR_DEV(inst), \
.disc_pull_up = DISC_PULL_UP(inst), \
LIS2DH_CFG_INT(inst) \
}

2
drivers/sensor/lis2dh/lis2dh.h
View file

@ -200,6 +200,8 @@ struct lis2dh_config {
gpio_pin_t irq2_pin;
gpio_dt_flags_t irq2_flags;
#endif /* CONFIG_LIS2DH_TRIGGER */
bool is_lsm303agr_dev;
bool disc_pull_up;
};
struct lis2dh_transfer_function {