michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: sensor: lps25hb: Update driver to use i2c_dt_spec

Browse source 
Simplify driver by using i2c_dt_spec for bus access.

Signed-off-by: Benjamin Björnsson <benjamin.bjornsson@gmail.com>
This commit is contained in:
Benjamin Björnsson 2022-06-23 17:09:01 +02:00 • committed by Maureen Helm
commit d4731daaf6
2 changed files with 19 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

46
drivers/sensor/lps25hb/lps25hb.c
View file

@ -22,24 +22,20 @@ LOG_MODULE_REGISTER(LPS25HB, CONFIG_SENSOR_LOG_LEVEL);
static inline int lps25hb_power_ctrl(const struct device *dev, uint8_t value)
{
struct lps25hb_data *data = dev->data;
const struct lps25hb_config *config = dev->config;
return i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr,
LPS25HB_REG_CTRL_REG1,
LPS25HB_MASK_CTRL_REG1_PD,
value << LPS25HB_SHIFT_CTRL_REG1_PD);
return i2c_reg_update_byte_dt(&config->i2c, LPS25HB_REG_CTRL_REG1,
LPS25HB_MASK_CTRL_REG1_PD,
value << LPS25HB_SHIFT_CTRL_REG1_PD);
}
static inline int lps25hb_set_odr_raw(const struct device *dev, uint8_t odr)
{
struct lps25hb_data *data = dev->data;
const struct lps25hb_config *config = dev->config;
return i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr,
LPS25HB_REG_CTRL_REG1,
LPS25HB_MASK_CTRL_REG1_ODR,
odr << LPS25HB_SHIFT_CTRL_REG1_ODR);
return i2c_reg_update_byte_dt(&config->i2c, LPS25HB_REG_CTRL_REG1,
LPS25HB_MASK_CTRL_REG1_ODR,
odr << LPS25HB_SHIFT_CTRL_REG1_ODR);
}
static int lps25hb_sample_fetch(const struct device *dev,
@ -53,9 +49,9 @@ static int lps25hb_sample_fetch(const struct device *dev,
__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL);
for (offset = 0; offset < sizeof(out); ++offset) {
if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr,
LPS25HB_REG_PRESS_OUT_XL + offset,
out + offset) < 0) {
if (i2c_reg_read_byte_dt(&config->i2c,
LPS25HB_REG_PRESS_OUT_XL + offset,
out + offset) < 0) {
LOG_DBG("failed to read sample");
return -EIO;
}
@ -113,7 +109,6 @@ static const struct sensor_driver_api lps25hb_api_funcs = {
static int lps25hb_init_chip(const struct device *dev)
{
struct lps25hb_data *data = dev->data;
const struct lps25hb_config *config = dev->config;
uint8_t chip_id;
@ -127,8 +122,8 @@ static int lps25hb_init_chip(const struct device *dev)
k_busy_wait(USEC_PER_MSEC * 20U);
if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr,
LPS25HB_REG_WHO_AM_I, &chip_id) < 0) {
if (i2c_reg_read_byte_dt(&config->i2c, LPS25HB_REG_WHO_AM_I,
&chip_id) < 0) {
LOG_DBG("failed reading chip id");
goto err_poweroff;
}
@ -145,10 +140,9 @@ static int lps25hb_init_chip(const struct device *dev)
goto err_poweroff;
}
if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr,
LPS25HB_REG_CTRL_REG1,
LPS25HB_MASK_CTRL_REG1_BDU,
(1 << LPS25HB_SHIFT_CTRL_REG1_BDU)) < 0) {
if (i2c_reg_update_byte_dt(&config->i2c, LPS25HB_REG_CTRL_REG1,
LPS25HB_MASK_CTRL_REG1_BDU,
(1 << LPS25HB_SHIFT_CTRL_REG1_BDU)) < 0) {
LOG_DBG("failed to set BDU");
goto err_poweroff;
}
@ -163,13 +157,10 @@ err_poweroff:
static int lps25hb_init(const struct device *dev)
{
const struct lps25hb_config * const config = dev->config;
struct lps25hb_data *data = dev->data;
data->i2c_master = device_get_binding(config->i2c_master_dev_name);
if (!data->i2c_master) {
LOG_DBG("i2c master not found: %s",
config->i2c_master_dev_name);
return -EINVAL;
if (!device_is_ready(config->i2c.bus)) {
LOG_ERR("I2C bus device not ready");
return -ENODEV;
}
if (lps25hb_init_chip(dev) < 0) {
@ -181,8 +172,7 @@ static int lps25hb_init(const struct device *dev)
}
static const struct lps25hb_config lps25hb_config = {
.i2c_master_dev_name = DT_INST_BUS_LABEL(0),
.i2c_slave_addr = DT_INST_REG_ADDR(0),
.i2c = I2C_DT_SPEC_INST_GET(0),
};
static struct lps25hb_data lps25hb_data;

5
drivers/sensor/lps25hb/lps25hb.h
View file

@ -147,13 +147,10 @@
struct lps25hb_config {
char *i2c_master_dev_name;
uint16_t i2c_slave_addr;
struct i2c_dt_spec i2c;
};
struct lps25hb_data {
const struct device *i2c_master;
int32_t sample_press;
int16_t sample_temp;
};