michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: sensor: lis2dh: convert to spi_dt_spec

Browse source 
Convert lis2dh driver to use `spi_dt_spec` helpers.

Signed-off-by: Bartosz Bilas <bartosz.bilas@hotmail.com>
This commit is contained in:
Bartosz Bilas 2022-02-13 14:01:45 +01:00 • committed by Anas Nashif
commit db2b6de0b8
3 changed files with 13 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -455,48 +455,6 @@ int lis2dh_init(const struct device *dev)
#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.
*/
#define LIS2DH_HAS_CS(inst) DT_INST_SPI_DEV_HAS_CS_GPIOS(inst)
#define LIS2DH_DATA_SPI_CS(inst) \
{ .cs_ctrl = { \
.gpio_pin = DT_INST_SPI_DEV_CS_GPIOS_PIN(inst), \
.gpio_dt_flags = DT_INST_SPI_DEV_CS_GPIOS_FLAGS(inst), \
}, \
}
#define LIS2DH_DATA_SPI(inst) \
COND_CODE_1(LIS2DH_HAS_CS(inst), \
(LIS2DH_DATA_SPI_CS(inst)), \
({}))
#define LIS2DH_SPI_CS_PTR(inst) \
COND_CODE_1(LIS2DH_HAS_CS(inst), \
(&(lis2dh_data_##inst.cs_ctrl)), \
(NULL))
#define LIS2DH_SPI_CS_LABEL(inst) \
COND_CODE_1(LIS2DH_HAS_CS(inst), \
(DT_INST_SPI_DEV_CS_GPIOS_LABEL(inst)), (NULL))
#define LIS2DH_SPI_CFG(inst) \
(&(struct lis2dh_spi_cfg) { \
.spi_conf = { \
.frequency = \
DT_INST_PROP(inst, spi_max_frequency), \
.operation = (SPI_WORD_SET(8) | \
SPI_OP_MODE_MASTER | \
SPI_MODE_CPOL | \
SPI_MODE_CPHA), \
.slave = DT_INST_REG_ADDR(inst), \
.cs = LIS2DH_SPI_CS_PTR(inst), \
}, \
.cs_gpios_label = LIS2DH_SPI_CS_LABEL(inst), \
})
#ifdef CONFIG_LIS2DH_TRIGGER
#define GPIO_DT_SPEC_INST_GET_BY_IDX_COND(id, prop, idx) \
COND_CODE_1(DT_INST_PROP_HAS_IDX(id, prop, idx), \
@ -540,7 +498,12 @@ 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) }, \
.bus_cfg = { .spi = SPI_DT_SPEC_INST_GET(inst, \
SPI_WORD_SET(8) | \
SPI_OP_MODE_MASTER | \
SPI_MODE_CPOL | \
SPI_MODE_CPHA, \
0) }, \
.is_lsm303agr_dev = IS_LSM303AGR_DEV(inst), \
.disc_pull_up = DISC_PULL_UP(inst), \
LIS2DH_CFG_TEMPERATURE(inst) \
@ -548,8 +511,7 @@ int lis2dh_init(const struct device *dev)
}
#define LIS2DH_DEFINE_SPI(inst) \
static struct lis2dh_data lis2dh_data_##inst = \
LIS2DH_DATA_SPI(inst); \
static struct lis2dh_data lis2dh_data_##inst; \
static const struct lis2dh_config lis2dh_config_##inst = \
LIS2DH_CONFIG_SPI(inst); \
LIS2DH_DEVICE_INIT(inst)

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

@ -173,20 +173,13 @@ union lis2dh_sample {
} __packed;
};
#if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
struct lis2dh_spi_cfg {
struct spi_config spi_conf;
const char *cs_gpios_label;
};
#endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) */
union lis2dh_bus_cfg {
#if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
uint16_t i2c_slv_addr;
#endif
#if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
const struct lis2dh_spi_cfg *spi_cfg;
struct spi_dt_spec spi;
#endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) */
};
@ -256,10 +249,6 @@ struct lis2dh_data {
#endif
#endif /* CONFIG_LIS2DH_TRIGGER */
#if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
struct spi_cs_control cs_ctrl;
#endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) */
};
#if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)

27
drivers/sensor/lis2dh/lis2dh_spi.c
View file

@ -23,15 +23,10 @@ LOG_MODULE_DECLARE(lis2dh, CONFIG_SENSOR_LOG_LEVEL);
#define LIS2DH_SPI_AUTOINC BIT(6)
#define LIS2DH_SPI_ADDR_MASK BIT_MASK(6)
/* LIS2DH supports only SPI mode 0, word size 8 bits, MSB first */
#define LIS2DH_SPI_CFG SPI_WORD_SET(8)
static int lis2dh_raw_read(const struct device *dev, uint8_t reg_addr,
uint8_t *value, uint8_t len)
{
struct lis2dh_data *data = dev->data;
const struct lis2dh_config *cfg = dev->config;
const struct spi_config *spi_cfg = &cfg->bus_cfg.spi_cfg->spi_conf;
uint8_t buffer_tx[2] = { reg_addr | LIS2DH_SPI_READ_BIT, 0 };
const struct spi_buf tx_buf = {
.buf = buffer_tx,
@ -65,7 +60,7 @@ static int lis2dh_raw_read(const struct device *dev, uint8_t reg_addr,
buffer_tx[0] |= LIS2DH_SPI_AUTOINC;
}
if (spi_transceive(data->bus, spi_cfg, &tx, &rx)) {
if (spi_transceive_dt(&cfg->bus_cfg.spi, &tx, &rx)) {
return -EIO;
}
@ -75,9 +70,7 @@ static int lis2dh_raw_read(const struct device *dev, uint8_t reg_addr,
static int lis2dh_raw_write(const struct device *dev, uint8_t reg_addr,
uint8_t *value, uint8_t len)
{
struct lis2dh_data *data = dev->data;
const struct lis2dh_config *cfg = dev->config;
const struct spi_config *spi_cfg = &cfg->bus_cfg.spi_cfg->spi_conf;
uint8_t buffer_tx[1] = { reg_addr & ~LIS2DH_SPI_READ_BIT };
const struct spi_buf tx_buf[2] = {
{
@ -103,7 +96,7 @@ static int lis2dh_raw_write(const struct device *dev, uint8_t reg_addr,
buffer_tx[0] |= LIS2DH_SPI_AUTOINC;
}
if (spi_write(data->bus, spi_cfg, &tx)) {
if (spi_write_dt(&cfg->bus_cfg.spi, &tx)) {
return -EIO;
}
@ -159,22 +152,12 @@ int lis2dh_spi_init(const struct device *dev)
{
struct lis2dh_data *data = dev->data;
const struct lis2dh_config *cfg = dev->config;
const struct lis2dh_spi_cfg *spi_cfg = cfg->bus_cfg.spi_cfg;
data->hw_tf = &lis2dh_spi_transfer_fn;
if (spi_cfg->cs_gpios_label != NULL) {
/* handle SPI CS thru GPIO if it is the case */
data->cs_ctrl.gpio_dev =
device_get_binding(spi_cfg->cs_gpios_label);
if (!data->cs_ctrl.gpio_dev) {
LOG_ERR("Unable to get GPIO SPI CS device");
return -ENODEV;
}
LOG_DBG("SPI GPIO CS configured on %s:%u",
spi_cfg->cs_gpios_label, data->cs_ctrl.gpio_pin);
if (!spi_is_ready(&cfg->bus_cfg.spi)) {
LOG_ERR("SPI bus is not ready");
return -ENODEV;
}
return 0;