michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers/sensor: iis2iclx: add multi-instance

Browse source 
Make this driver multi-instance and use the new API.

Notes for sensorhub mode:
In case of multiples devices it is possible that some of them
has i2c slaves attached to it (sensorhub mode) but not the
others. Since the driver is configured in the same way for
all the instances (CONFIG_SENSORHUB=y), the routine that initialize
the sensorhub part does not fail anymore in case no slaves
are found for a particular instance. Instead, those non-sensorhub
driver instances will set the shub_inited flag to false and
will totally ignore the feature.

Notes for triggers:
In case of multiples devices the device pin the interrupt wire is
attached to can be different (INT1 or INT2 pin). So, this
information has been moved in DTS and then stored in the
specific instance config structure.
Currently the driver is able to handle a sngle interrupt line
at a time attached to either INT1 or INT2.
MOreover, the interrupt initialization for a driver instance proceed
only if the drdy has been configured in its DT, else it returns ok.

Signed-off-by: Armando Visconti <armando.visconti@st.com>
This commit is contained in:
Armando Visconti 2020-10-14 14:32:39 +02:00 • committed by Carles Cufí
commit c380142920
12 changed files with 265 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/sensor/iis2iclx/Kconfig
View file

@ -53,20 +53,6 @@ config IIS2ICLX_THREAD_STACK_SIZE
help
Stack size of thread used by the driver to handle interrupts.
choice IIS2ICLX_INT_PIN
prompt "Sensor INT pin number"
default IIS2ICLX_INT_PIN_1
help
The number of IIS2ICLX int pin used to generate interrupt to cpu.
Supported values are int1 or int2
config IIS2ICLX_INT_PIN_1
bool "int1"
config IIS2ICLX_INT_PIN_2
bool "int2"
endchoice
endif # IIS2ICLX_TRIGGER
config IIS2ICLX_ENABLE_TEMP

218
drivers/sensor/iis2iclx/iis2iclx.c
View file

@ -177,6 +177,10 @@ static int iis2iclx_attr_set(const struct device *dev,
enum sensor_attribute attr,
const struct sensor_value *val)
{
#if defined(CONFIG_IIS2ICLX_SENSORHUB)
struct iis2iclx_data *data = dev->data;
#endif /* CONFIG_IIS2ICLX_SENSORHUB */
switch (chan) {
case SENSOR_CHAN_ACCEL_XYZ:
return iis2iclx_accel_config(dev, chan, attr, val);
@ -184,6 +188,11 @@ static int iis2iclx_attr_set(const struct device *dev,
case SENSOR_CHAN_MAGN_XYZ:
case SENSOR_CHAN_PRESS:
case SENSOR_CHAN_HUMIDITY:
if (!data->shub_inited) {
LOG_ERR("shub not inited.");
return -ENOTSUP;
}
return iis2iclx_shub_config(dev, chan, attr, val);
#endif /* CONFIG_IIS2ICLX_SENSORHUB */
default:
@ -230,6 +239,13 @@ static int iis2iclx_sample_fetch_temp(const struct device *dev)
#if defined(CONFIG_IIS2ICLX_SENSORHUB)
static int iis2iclx_sample_fetch_shub(const struct device *dev)
{
struct iis2iclx_data *data = dev->data;
if (!data->shub_inited) {
LOG_WRN("attr_set() shub not inited.");
return 0;
}
if (iis2iclx_shub_fetch_external_devs(dev) < 0) {
LOG_ERR("failed to read ext shub devices");
return -EIO;
@ -245,6 +261,7 @@ static int iis2iclx_sample_fetch(const struct device *dev,
switch (chan) {
case SENSOR_CHAN_ACCEL_XYZ:
iis2iclx_sample_fetch_accel(dev);
#if defined(CONFIG_IIS2ICLX_SENSORHUB)
iis2iclx_sample_fetch_shub(dev);
#endif
@ -474,18 +491,38 @@ static int iis2iclx_channel_get(const struct device *dev,
case SENSOR_CHAN_MAGN_Y:
case SENSOR_CHAN_MAGN_Z:
case SENSOR_CHAN_MAGN_XYZ:
if (!data->shub_inited) {
LOG_ERR("shub not inited.");
return -ENOTSUP;
}
iis2iclx_magn_get_channel(chan, val, data);
break;
case SENSOR_CHAN_HUMIDITY:
if (!data->shub_inited) {
LOG_ERR("shub not inited.");
return -ENOTSUP;
}
iis2iclx_hum_convert(val, data);
break;
case SENSOR_CHAN_PRESS:
if (!data->shub_inited) {
LOG_ERR("shub not inited.");
return -ENOTSUP;
}
iis2iclx_press_convert(val, data);
break;
case SENSOR_CHAN_AMBIENT_TEMP:
if (!data->shub_inited) {
LOG_ERR("attr_set() shub not inited.");
return -ENOTSUP;
}
iis2iclx_temp_convert(val, data);
break;
#endif
@ -496,7 +533,7 @@ static int iis2iclx_channel_get(const struct device *dev,
return 0;
}
static const struct sensor_driver_api iis2iclx_api_funcs = {
static const struct sensor_driver_api iis2iclx_driver_api = {
.attr_set = iis2iclx_attr_set,
#if CONFIG_IIS2ICLX_TRIGGER
.trigger_set = iis2iclx_trigger_set,
@ -558,61 +595,6 @@ static int iis2iclx_init_chip(const struct device *dev)
return 0;
}
static struct iis2iclx_data iis2iclx_data;
static const struct iis2iclx_config iis2iclx_config = {
.bus_name = DT_INST_BUS_LABEL(0),
#if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
.bus_init = iis2iclx_spi_init,
.spi_conf.frequency = DT_INST_PROP(0, spi_max_frequency),
.spi_conf.operation = (SPI_OP_MODE_MASTER | SPI_MODE_CPOL |
SPI_MODE_CPHA | SPI_WORD_SET(8) |
SPI_LINES_SINGLE),
.spi_conf.slave = DT_INST_REG_ADDR(0),
#if DT_INST_SPI_DEV_HAS_CS_GPIOS(0)
.gpio_cs_port = DT_INST_SPI_DEV_CS_GPIOS_LABEL(0),
.cs_gpio = DT_INST_SPI_DEV_CS_GPIOS_PIN(0),
.cs_gpio_flags = DT_INST_SPI_DEV_CS_GPIOS_FLAGS(0),
.spi_conf.cs = &iis2iclx_data.cs_ctrl,
#else
.spi_conf.cs = NULL,
#endif
#elif DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
.bus_init = iis2iclx_i2c_init,
.i2c_slv_addr = DT_INST_REG_ADDR(0),
#else
#error "BUS MACRO NOT DEFINED IN DTS"
#endif
#ifdef CONFIG_IIS2ICLX_TRIGGER
#if DT_INST_PROP_HAS_IDX(0, drdy_gpios, 1)
/* Two gpio pins declared in DTS */
#if defined(CONFIG_IIS2ICLX_INT_PIN_1)
.int_gpio_port = DT_INST_GPIO_LABEL_BY_IDX(0, drdy_gpios, 0),
.int_gpio_pin = DT_INST_GPIO_PIN_BY_IDX(0, drdy_gpios, 0),
.int_gpio_flags = DT_INST_GPIO_FLAGS_BY_IDX(0, drdy_gpios, 0),
.int_pin = 1,
#elif defined(CONFIG_IIS2ICLX_INT_PIN_2)
.int_gpio_port = DT_INST_GPIO_LABEL_BY_IDX(0, drdy_gpios, 1),
.int_gpio_pin = DT_INST_GPIO_PIN_BY_IDX(0, drdy_gpios, 1),
.int_gpio_flags = DT_INST_GPIO_FLAGS_BY_IDX(0, drdy_gpios, 1),
.int_pin = 2,
#endif /* CONFIG_IIS2ICLX_INT_PIN_* */
#else
/* One gpio pin declared in DTS */
.int_gpio_port = DT_INST_GPIO_LABEL(0, drdy_gpios),
.int_gpio_pin = DT_INST_GPIO_PIN(0, drdy_gpios),
.int_gpio_flags = DT_INST_GPIO_FLAGS(0, drdy_gpios),
#if defined(CONFIG_IIS2ICLX_INT_PIN_1)
.int_pin = 1,
#elif defined(CONFIG_IIS2ICLX_INT_PIN_2)
.int_pin = 2,
#endif /* CONFIG_IIS2ICLX_INT_PIN_* */
#endif /* DT_INST_PROP_HAS_IDX(0, drdy_gpios, 1) */
#endif /* CONFIG_IIS2ICLX_TRIGGER */
};
static int iis2iclx_init(const struct device *dev)
{
const struct iis2iclx_config * const config = dev->config;
@ -641,17 +623,129 @@ static int iis2iclx_init(const struct device *dev)
#ifdef CONFIG_IIS2ICLX_SENSORHUB
if (iis2iclx_shub_init(dev) < 0) {
LOG_ERR("failed to initialize external chip");
return -EIO;
LOG_INF("failed to initialize external chips");
data->shub_inited = false;
}
data->shub_inited = true;
#endif
return 0;
}
#if DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 0
#warning "IIS2ICLX driver enabled without any devices"
#endif
static struct iis2iclx_data iis2iclx_data;
/*
* Device creation macro, shared by IIS2ICLX_DEFINE_SPI() and
* IIS2ICLX_DEFINE_I2C().
*/
DEVICE_AND_API_INIT(iis2iclx, DT_INST_LABEL(0), iis2iclx_init,
&iis2iclx_data, &iis2iclx_config, POST_KERNEL,
CONFIG_SENSOR_INIT_PRIORITY, &iis2iclx_api_funcs);
#define IIS2ICLX_DEVICE_INIT(inst) \
DEVICE_AND_API_INIT(iis2iclx_##inst, \
DT_INST_LABEL(inst), \
iis2iclx_init, \
&iis2iclx_data_##inst, \
&iis2iclx_config_##inst, \
POST_KERNEL, \
CONFIG_SENSOR_INIT_PRIORITY, \
&iis2iclx_driver_api);
/*
* Instantiation macros used when a device is on a SPI bus.
*/
#define IIS2ICLX_HAS_CS(inst) DT_INST_SPI_DEV_HAS_CS_GPIOS(inst)
#define IIS2ICLX_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 IIS2ICLX_DATA_SPI(inst) \
COND_CODE_1(IIS2ICLX_HAS_CS(inst), \
(IIS2ICLX_DATA_SPI_CS(inst)), \
({}))
#define IIS2ICLX_SPI_CS_PTR(inst) \
COND_CODE_1(IIS2ICLX_HAS_CS(inst), \
(&(iis2iclx_data_##inst.cs_ctrl)), \
(NULL))
#define IIS2ICLX_SPI_CS_LABEL(inst) \
COND_CODE_1(IIS2ICLX_HAS_CS(inst), \
(DT_INST_SPI_DEV_CS_GPIOS_LABEL(inst)), (NULL))
#define IIS2ICLX_SPI_CFG(inst) \
(&(struct iis2iclx_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 = IIS2ICLX_SPI_CS_PTR(inst), \
}, \
.cs_gpios_label = IIS2ICLX_SPI_CS_LABEL(inst), \
})
#ifdef CONFIG_IIS2ICLX_TRIGGER
#define IIS2ICLX_CFG_IRQ(inst) \
.irq_dev_name = DT_INST_GPIO_LABEL(inst, drdy_gpios), \
.irq_pin = DT_INST_GPIO_PIN(inst, drdy_gpios), \
.irq_flags = DT_INST_GPIO_FLAGS(inst, drdy_gpios), \
.int_pin = DT_INST_PROP(inst, int_pin)
#else
#define IIS2ICLX_CFG_IRQ(inst)
#endif /* CONFIG_IIS2ICLX_TRIGGER */
#define IIS2ICLX_CONFIG_SPI(inst) \
{ \
.bus_name = DT_INST_BUS_LABEL(inst), \
.bus_init = iis2iclx_spi_init, \
.bus_cfg = { .spi_cfg = IIS2ICLX_SPI_CFG(inst) }, \
COND_CODE_1(DT_INST_NODE_HAS_PROP(inst, drdy_gpios), \
(IIS2ICLX_CFG_IRQ(inst)), ()) \
}
#define IIS2ICLX_DEFINE_SPI(inst) \
static struct iis2iclx_data iis2iclx_data_##inst = \
IIS2ICLX_DATA_SPI(inst); \
static const struct iis2iclx_config iis2iclx_config_##inst = \
IIS2ICLX_CONFIG_SPI(inst); \
IIS2ICLX_DEVICE_INIT(inst)
/*
* Instantiation macros used when a device is on an I2C bus.
*/
#define IIS2ICLX_CONFIG_I2C(inst) \
{ \
.bus_name = DT_INST_BUS_LABEL(inst), \
.bus_init = iis2iclx_i2c_init, \
.bus_cfg = { .i2c_slv_addr = DT_INST_REG_ADDR(inst), }, \
COND_CODE_1(DT_INST_NODE_HAS_PROP(inst, drdy_gpios), \
(IIS2ICLX_CFG_IRQ(inst)), ()) \
}
#define IIS2ICLX_DEFINE_I2C(inst) \
static struct iis2iclx_data iis2iclx_data_##inst; \
static const struct iis2iclx_config iis2iclx_config_##inst = \
IIS2ICLX_CONFIG_I2C(inst); \
IIS2ICLX_DEVICE_INIT(inst)
/*
* Main instantiation macro. Use of COND_CODE_1() selects the right
* bus-specific macro at preprocessor time.
*/
#define IIS2ICLX_DEFINE(inst) \
COND_CODE_1(DT_INST_ON_BUS(inst, spi), \
(IIS2ICLX_DEFINE_SPI(inst)), \
(IIS2ICLX_DEFINE_I2C(inst)))
DT_INST_FOREACH_STATUS_OKAY(IIS2ICLX_DEFINE)

69
drivers/sensor/iis2iclx/iis2iclx.h
View file

@ -14,10 +14,17 @@
#include <drivers/sensor.h>
#include <zephyr/types.h>
#include <drivers/gpio.h>
#include <drivers/spi.h>
#include <sys/util.h>
#include "iis2iclx_reg.h"
#if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
#include <drivers/spi.h>
#endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) */
#if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
#include <drivers/i2c.h>
#endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c) */
#define IIS2ICLX_EN_BIT 0x01
#define IIS2ICLX_DIS_BIT 0x00
@ -50,43 +57,38 @@
#define IIS2ICLX_ACCEL_ODR_RUNTIME 1
#endif
#if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
struct iis2iclx_spi_cfg {
struct spi_config spi_conf;
const char *cs_gpios_label;
};
#endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) */
union iis2iclx_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 iis2iclx_spi_cfg *spi_cfg;
#endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) */
};
struct iis2iclx_config {
char *bus_name;
int (*bus_init)(const struct device *dev);
const union iis2iclx_bus_cfg bus_cfg;
#ifdef CONFIG_IIS2ICLX_TRIGGER
const char *int_gpio_port;
uint8_t int_gpio_pin;
uint8_t int_gpio_flags;
const char *irq_dev_name;
uint8_t irq_pin;
uint8_t irq_flags;
uint8_t int_pin;
#endif /* CONFIG_IIS2ICLX_TRIGGER */
#if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
uint16_t i2c_slv_addr;
#elif DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
struct spi_config spi_conf;
#if DT_INST_SPI_DEV_HAS_CS_GPIOS(0)
const char *gpio_cs_port;
uint8_t cs_gpio;
uint8_t cs_gpio_flags;
#endif /* DT_INST_SPI_DEV_HAS_CS_GPIOS(0) */
#endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c) */
};
/* sensor data forward declaration (member definition is below) */
struct iis2iclx_data;
struct iis2iclx_tf {
int (*read_data)(struct iis2iclx_data *data, uint8_t reg_addr,
uint8_t *value, uint8_t len);
int (*write_data)(struct iis2iclx_data *data, uint8_t reg_addr,
uint8_t *value, uint8_t len);
int (*read_reg)(struct iis2iclx_data *data, uint8_t reg_addr,
uint8_t *value);
int (*write_reg)(struct iis2iclx_data *data, uint8_t reg_addr,
uint8_t value);
int (*update_reg)(struct iis2iclx_data *data, uint8_t reg_addr,
uint8_t mask, uint8_t value);
};
#define IIS2ICLX_SHUB_MAX_NUM_SLVS 2
struct iis2iclx_data {
@ -107,15 +109,18 @@ struct iis2iclx_data {
int16_t y0;
int16_t y1;
} hts221;
bool shub_inited;
#endif /* CONFIG_IIS2ICLX_SENSORHUB */
stmdev_ctx_t *ctx;
#if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
#if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
stmdev_ctx_t ctx_i2c;
#elif DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
#endif
#if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
stmdev_ctx_t ctx_spi;
#endif
#endif
uint16_t accel_freq;
uint8_t accel_fs;
@ -135,9 +140,9 @@ struct iis2iclx_data {
#endif
#endif /* CONFIG_IIS2ICLX_TRIGGER */
#if DT_INST_SPI_DEV_HAS_CS_GPIOS(0)
#if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
struct spi_cs_control cs_ctrl;
#endif
#endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) */
};
int iis2iclx_spi_init(const struct device *dev);

11
drivers/sensor/iis2iclx/iis2iclx_i2c.c
View file

@ -11,7 +11,6 @@
#define DT_DRV_COMPAT st_iis2iclx
#include <string.h>
#include <drivers/i2c.h>
#include <logging/log.h>
#include "iis2iclx.h"
@ -23,18 +22,20 @@ LOG_MODULE_DECLARE(IIS2ICLX, CONFIG_SENSOR_LOG_LEVEL);
static int iis2iclx_i2c_read(struct iis2iclx_data *data, uint8_t reg_addr,
uint8_t *value, uint8_t len)
{
const struct iis2iclx_config *cfg = data->dev->config;
const struct device *dev = data->dev;
const struct iis2iclx_config *cfg = dev->config;
return i2c_burst_read(data->bus, cfg->i2c_slv_addr,
return i2c_burst_read(data->bus, cfg->bus_cfg.i2c_slv_addr,
reg_addr, value, len);
}
static int iis2iclx_i2c_write(struct iis2iclx_data *data, uint8_t reg_addr,
uint8_t *value, uint8_t len)
{
const struct iis2iclx_config *cfg = data->dev->config;
const struct device *dev = data->dev;
const struct iis2iclx_config *cfg = dev->config;
return i2c_burst_write(data->bus, cfg->i2c_slv_addr,
return i2c_burst_write(data->bus, cfg->bus_cfg.i2c_slv_addr,
reg_addr, value, len);
}

4
drivers/sensor/iis2iclx/iis2iclx_shub.c
View file

@ -775,8 +775,8 @@ int iis2iclx_shub_init(const struct device *dev)
}
if (num_ext_dev == 0) {
LOG_ERR("shub: no slave devices found");
return -EINVAL;
LOG_WRN("shub: no slave devices found");
return -ENOTSUP;
}
/* init external devices */

37
drivers/sensor/iis2iclx/iis2iclx_spi.c
View file

@ -23,8 +23,9 @@ LOG_MODULE_DECLARE(IIS2ICLX, CONFIG_SENSOR_LOG_LEVEL);
static int iis2iclx_spi_read(struct iis2iclx_data *data, uint8_t reg_addr,
uint8_t *value, uint8_t len)
{
const struct iis2iclx_config *cfg = data->dev->config;
const struct spi_config *spi_cfg = &cfg->spi_conf;
const struct device *dev = data->dev;
const struct iis2iclx_config *cfg = dev->config;
const struct spi_config *spi_cfg = &cfg->bus_cfg.spi_cfg->spi_conf;
uint8_t buffer_tx[2] = { reg_addr | IIS2ICLX_SPI_READ, 0 };
const struct spi_buf tx_buf = {
.buf = buffer_tx,
@ -64,8 +65,9 @@ static int iis2iclx_spi_read(struct iis2iclx_data *data, uint8_t reg_addr,
static int iis2iclx_spi_write(struct iis2iclx_data *data, uint8_t reg_addr,
uint8_t *value, uint8_t len)
{
const struct iis2iclx_config *cfg = data->dev->config;
const struct spi_config *spi_cfg = &cfg->spi_conf;
const struct device *dev = data->dev;
const struct iis2iclx_config *cfg = dev->config;
const struct spi_config *spi_cfg = &cfg->bus_cfg.spi_cfg->spi_conf;
uint8_t buffer_tx[1] = { reg_addr & ~IIS2ICLX_SPI_READ };
const struct spi_buf tx_buf[2] = {
{
@ -97,6 +99,8 @@ static int iis2iclx_spi_write(struct iis2iclx_data *data, uint8_t reg_addr,
int iis2iclx_spi_init(const struct device *dev)
{
struct iis2iclx_data *data = dev->data;
const struct iis2iclx_config *cfg = dev->config;
const struct iis2iclx_spi_cfg *spi_cfg = cfg->bus_cfg.spi_cfg;
data->ctx_spi.read_reg = (stmdev_read_ptr) iis2iclx_spi_read,
data->ctx_spi.write_reg = (stmdev_write_ptr) iis2iclx_spi_write,
@ -104,24 +108,19 @@ int iis2iclx_spi_init(const struct device *dev)
data->ctx = &data->ctx_spi;
data->ctx->handle = data;
#if DT_INST_SPI_DEV_HAS_CS_GPIOS(0)
const struct iis2iclx_config *cfg = dev->config;
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;
}
/* handle SPI CS thru GPIO if it is the case */
data->cs_ctrl.gpio_dev = device_get_binding(cfg->gpio_cs_port);
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);
}
data->cs_ctrl.gpio_pin = cfg->cs_gpio;
data->cs_ctrl.gpio_dt_flags = cfg->cs_gpio_flags;
data->cs_ctrl.delay = 0;
LOG_DBG("SPI GPIO CS configured on %s:%u",
cfg->gpio_cs_port, cfg->cs_gpio);
#endif
return 0;
}
#endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) */

32
drivers/sensor/iis2iclx/iis2iclx_trigger.c
View file

@ -93,6 +93,12 @@ int iis2iclx_trigger_set(const struct device *dev,
{
struct iis2iclx_data *iis2iclx = dev->data;
/* If drdy_gpio is not configured in DT just return error */
if (!iis2iclx->gpio) {
LOG_ERR("triggers not supported");
return -ENOTSUP;
}
if (trig->chan == SENSOR_CHAN_ACCEL_XYZ) {
iis2iclx->handler_drdy_acc = handler;
if (handler) {
@ -153,7 +159,7 @@ static void iis2iclx_handle_interrupt(const struct device *dev)
#endif
}
gpio_pin_interrupt_configure(iis2iclx->gpio, cfg->int_gpio_pin,
gpio_pin_interrupt_configure(iis2iclx->gpio, cfg->irq_pin,
GPIO_INT_EDGE_TO_ACTIVE);
}
@ -166,7 +172,7 @@ static void iis2iclx_gpio_callback(const struct device *dev,
ARG_UNUSED(pins);
gpio_pin_interrupt_configure(iis2iclx->gpio, cfg->int_gpio_pin,
gpio_pin_interrupt_configure(iis2iclx->gpio, cfg->irq_pin,
GPIO_INT_DISABLE);
#if defined(CONFIG_IIS2ICLX_TRIGGER_OWN_THREAD)
@ -203,10 +209,10 @@ int iis2iclx_init_interrupt(const struct device *dev)
int ret;
/* setup data ready gpio interrupt (INT1 or INT2) */
iis2iclx->gpio = device_get_binding(cfg->int_gpio_port);
iis2iclx->gpio = device_get_binding(cfg->irq_dev_name);
if (iis2iclx->gpio == NULL) {
LOG_ERR("Cannot get pointer to %s device", cfg->int_gpio_port);
return -EINVAL;
LOG_INF("Cannot get pointer to irq_dev_name");
goto end;
}
#if defined(CONFIG_IIS2ICLX_TRIGGER_OWN_THREAD)
@ -222,8 +228,8 @@ int iis2iclx_init_interrupt(const struct device *dev)
iis2iclx->work.handler = iis2iclx_work_cb;
#endif /* CONFIG_IIS2ICLX_TRIGGER_OWN_THREAD */
ret = gpio_pin_configure(iis2iclx->gpio, cfg->int_gpio_pin,
GPIO_INPUT | cfg->int_gpio_flags);
ret = gpio_pin_configure(iis2iclx->gpio, cfg->irq_pin,
GPIO_INPUT | cfg->irq_flags);
if (ret < 0) {
LOG_ERR("Could not configure gpio");
return ret;
@ -231,7 +237,7 @@ int iis2iclx_init_interrupt(const struct device *dev)
gpio_init_callback(&iis2iclx->gpio_cb,
iis2iclx_gpio_callback,
BIT(cfg->int_gpio_pin));
BIT(cfg->irq_pin));
if (gpio_add_callback(iis2iclx->gpio, &iis2iclx->gpio_cb) < 0) {
LOG_ERR("Could not set gpio callback");
@ -245,6 +251,12 @@ int iis2iclx_init_interrupt(const struct device *dev)
return -EIO;
}
return gpio_pin_interrupt_configure(iis2iclx->gpio, cfg->int_gpio_pin,
GPIO_INT_EDGE_TO_ACTIVE);
if (gpio_pin_interrupt_configure(iis2iclx->gpio, cfg->irq_pin,
GPIO_INT_EDGE_TO_ACTIVE) < 0) {
LOG_ERR("Could not configure interrupt");
return -EIO;
}
end:
return 0;
}

3
drivers/sensor/lsm6dsl/lsm6dsl_spi.c
View file

@ -10,9 +10,10 @@
#define DT_DRV_COMPAT st_lsm6dsl
#include <string.h>
#include "lsm6dsl.h"
#include <logging/log.h>
#include "lsm6dsl.h"
#if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
#define LSM6DSL_SPI_READ (1 << 7)

10
dts/bindings/sensor/st,iis2iclx-i2c.yaml
View file

@ -18,3 +18,13 @@ properties:
This pin defaults to active high when produced by the sensor.
The property value should ensure the flags properly describe
the signal that is presented to the driver.
int-pin:
type: int
required: false
default: 1
description: Device INT pin number (1 or 2)
This number represents which of the two interrupt pins
(INT1 or INT2) the line is attached to. This property is not
mandatory and if not present it defaults to 1.

10
dts/bindings/sensor/st,iis2iclx-spi.yaml
View file

@ -18,3 +18,13 @@ properties:
This pin defaults to active high when produced by the sensor.
The property value should ensure the flags properly describe
the signal that is presented to the driver.
int-pin:
type: int
required: false
default: 1
description: Device INT pin number (1 or 2)
This number represents which of the two interrupt pins
(INT1 or INT2) the line is attached to. This property is not
mandatory and if not present it defaults to 1.

1
tests/drivers/build_all/i2c.dtsi
View file

@ -548,6 +548,7 @@ test_i2c_iis2iclx: iis2iclx@6a {
label = "IIS2ICLX";
reg = <0x6a>;
drdy-gpios = <&test_gpio 0 0>;
int-pin = <1>;
};
test_i2c_itds: itds@18 {

1
tests/drivers/build_all/spi.dtsi
View file

@ -558,4 +558,5 @@ test_spi_iis2iclx: iis2iclx@37 {
reg = <0x37>;
spi-max-frequency = <0>;
drdy-gpios = <&test_gpio 0 0>;
int-pin = <1>;
};