michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: sensor: bmi160: Move SPI config to config

Browse source 
At present this driver only supports a single instance. It sets up some
of its config in the init routine. It is better to put config in
constant data so that multiple instances can be supported and RAM space
is minimised.

Update the driver accordingly.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2020-10-08 11:42:32 -06:00 • committed by Carles Cufí
commit 226cacbc3d
2 changed files with 33 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

51
drivers/sensor/bmi160/bmi160.c
View file

@ -21,11 +21,10 @@
LOG_MODULE_REGISTER(BMI160, CONFIG_SENSOR_LOG_LEVEL);
struct bmi160_data bmi160_data;
static int bmi160_transceive(const struct device *dev, uint8_t reg,
bool write, void *buf, size_t length)
{
const struct bmi160_cfg *cfg = to_config(dev);
struct bmi160_data *data = to_data(dev);
const struct spi_buf tx_buf[2] = {
{
@ -48,10 +47,10 @@ static int bmi160_transceive(const struct device *dev, uint8_t reg,
.count = 2
};
return spi_transceive(data->spi, &data->spi_cfg, &tx, &rx);
return spi_transceive(data->spi, &cfg->spi_cfg, &tx, &rx);
}
return spi_write(data->spi, &data->spi_cfg, &tx);
return spi_write(data->spi, &cfg->spi_cfg, &tx);
}
int bmi160_read(const struct device *dev, uint8_t reg_addr, uint8_t *data,
uint8_t len)
@ -806,21 +805,17 @@ static const struct sensor_driver_api bmi160_api = {
int bmi160_init(const struct device *dev)
{
const struct bmi160_cfg *cfg = to_config(dev);
struct bmi160_data *data = to_data(dev);
uint8_t val = 0U;
int32_t acc_range, gyr_range;
data->spi = device_get_binding(DT_INST_BUS_LABEL(0));
data->spi = device_get_binding(cfg->bus_label);
if (!data->spi) {
LOG_DBG("SPI master controller not found: %s.",
DT_INST_BUS_LABEL(0));
LOG_DBG("SPI master controller not found: %s.", cfg->bus_label);
return -EINVAL;
}
data->spi_cfg.operation = SPI_WORD_SET(8);
data->spi_cfg.frequency = DT_INST_PROP(0, spi_max_frequency);
data->spi_cfg.slave = DT_INST_REG_ADDR(0);
/* reboot the chip */
if (bmi160_byte_write(dev, BMI160_REG_CMD, BMI160_CMD_SOFT_RESET) < 0) {
LOG_DBG("Cannot reboot chip.");
@ -912,16 +907,32 @@ int bmi160_init(const struct device *dev)
return 0;
}
const struct bmi160_cfg bmi160_config = {
#if defined(CONFIG_BMI160_TRIGGER)
.gpio_port = DT_INST_GPIO_LABEL(0, int_gpios),
.int_pin = DT_INST_GPIO_PIN(0, int_gpios),
.int_flags = DT_INST_GPIO_FLAGS(0, int_gpios),
#define BMI160_TRIGGER_CFG(inst) \
.gpio_port = DT_INST_GPIO_LABEL(inst, int_gpios), \
.int_pin = DT_INST_GPIO_PIN(inst, int_gpios), \
.int_flags = DT_INST_GPIO_FLAGS(inst, int_gpios),
#else
#define BMI160_TRIGGER_CFG(inst)
#endif
};
DEVICE_AND_API_INIT(bmi160, DT_INST_LABEL(0), bmi160_init, &bmi160_data,
&bmi160_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
#define BMI160_DEVICE_INIT(inst) \
DEVICE_AND_API_INIT(bmi160, DT_INST_LABEL(inst), bmi160_init, \
&bmi160_data_##inst, &bmi160_cfg_##inst, \
POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, \
&bmi160_api);
#define BMI160_DEFINE_SPI(inst) \
static struct bmi160_data bmi160_data_##inst; \
static const struct bmi160_cfg bmi160_cfg_##inst = { \
BMI160_TRIGGER_CFG(inst) \
.bus_label = DT_INST_BUS_LABEL(inst), \
.spi_cfg = { \
.operation = SPI_WORD_SET(8), \
.frequency = DT_INST_PROP(inst, spi_max_frequency), \
.slave = DT_INST_REG_ADDR(inst), \
}, \
}; \
BMI160_DEVICE_INIT(inst)
DT_INST_FOREACH_STATUS_OKAY(BMI160_DEFINE_SPI)

3
drivers/sensor/bmi160/bmi160.h
View file

@ -399,6 +399,8 @@ struct bmi160_range {
};
struct bmi160_cfg {
struct spi_config spi_cfg;
const char *bus_label;
#if defined(CONFIG_BMI160_TRIGGER)
const char *gpio_port;
gpio_pin_t int_pin;
@ -456,7 +458,6 @@ struct bmi160_scale {
struct bmi160_data {
const struct device *spi;
struct spi_config spi_cfg;
#if defined(CONFIG_BMI160_TRIGGER)
const struct device *dev;
const struct device *gpio;