michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: sensor: ms5607: 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-07-15 18:08:16 +02:00 • committed by Fabio Baltieri
commit e6f9ef4cc7
3 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/sensor/ms5607/ms5607.c
View file

@ -333,9 +333,8 @@ static const struct sensor_driver_api ms5607_api_funcs = {
/* Initializes a struct ms5607_config for an instance on a I2C bus. */
#define MS5607_CONFIG_I2C(inst) \
{ \
.bus = DEVICE_DT_GET(DT_INST_BUS(inst)), \
.tf = &ms5607_i2c_transfer_function, \
.bus_cfg.i2c_addr = DT_INST_REG_ADDR(inst) \
.bus_cfg.i2c = I2C_DT_SPEC_INST_GET(inst), \
}
/*

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

@ -92,7 +92,7 @@ struct ms5607_config {
const struct ms5607_transfer_function *tf;
union {
#if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
uint16_t i2c_addr;
struct i2c_dt_spec i2c;
#endif
#if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
struct spi_dt_spec spi_bus;

11
drivers/sensor/ms5607/ms5607_i2c.c
View file

@ -19,7 +19,7 @@ LOG_MODULE_DECLARE(ms5607);
static int ms5607_i2c_raw_cmd(const struct ms5607_config *config, uint8_t cmd)
{
return i2c_write(config->bus, &cmd, 1, config->bus_cfg.i2c_addr);
return i2c_write_dt(&config->bus_cfg.i2c, &cmd, 1);
}
static int ms5607_i2c_reset(const struct ms5607_config *config)
@ -39,7 +39,7 @@ static int ms5607_i2c_read_prom(const struct ms5607_config *config, uint8_t cmd,
uint8_t valb[2];
int err;
err = i2c_burst_read(config->bus, config->bus_cfg.i2c_addr, cmd, valb, sizeof(valb));
err = i2c_burst_read_dt(&config->bus_cfg.i2c, cmd, valb, sizeof(valb));
if (err < 0) {
return err;
}
@ -60,8 +60,7 @@ static int ms5607_i2c_read_adc(const struct ms5607_config *config, uint32_t *val
int err;
uint8_t valb[3];
err = i2c_burst_read(config->bus, config->bus_cfg.i2c_addr,
MS5607_CMD_CONV_READ_ADC, valb, sizeof(valb));
err = i2c_burst_read_dt(&config->bus_cfg.i2c, MS5607_CMD_CONV_READ_ADC, valb, sizeof(valb));
if (err < 0) {
return err;
}
@ -74,8 +73,8 @@ static int ms5607_i2c_read_adc(const struct ms5607_config *config, uint32_t *val
static int ms5607_i2c_check(const struct ms5607_config *config)
{
if (!device_is_ready(config->bus)) {
LOG_DBG("I2C bus %s not ready", config->bus->name);
if (!device_is_ready(config->bus_cfg.i2c.bus)) {
LOG_DBG("I2C bus device not ready");
return -ENODEV;
}