michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: sensor: fxas21002: Update driver to use gpio_dt_spec

Browse source 
Simplify driver by using gpio_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-19 08:29:21 +02:00 • committed by Carles Cufí
commit e06359f616
3 changed files with 14 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/sensor/fxas21002/fxas21002.c
View file

@ -284,13 +284,9 @@ static const struct fxas21002_config fxas21002_config = {
.dr = CONFIG_FXAS21002_DR,
#ifdef CONFIG_FXAS21002_TRIGGER
#ifdef CONFIG_FXAS21002_DRDY_INT1
.gpio_name = DT_INST_GPIO_LABEL(0, int1_gpios),
.gpio_pin = DT_INST_GPIO_PIN(0, int1_gpios),
.gpio_flags = DT_INST_GPIO_FLAGS(0, int1_gpios),
.int_gpio = GPIO_DT_SPEC_INST_GET(0, int1_gpios),
#else
.gpio_name = DT_INST_GPIO_LABEL(0, int2_gpios),
.gpio_pin = DT_INST_GPIO_PIN(0, int2_gpios),
.gpio_flags = DT_INST_GPIO_FLAGS(0, int2_gpios),
.int_gpio = GPIO_DT_SPEC_INST_GET(0, int2_gpios),
#endif
#endif
};

6
drivers/sensor/fxas21002/fxas21002.h
View file

@ -59,9 +59,7 @@ enum fxas21002_channel {
struct fxas21002_config {
struct i2c_dt_spec i2c;
#ifdef CONFIG_FXAS21002_TRIGGER
char *gpio_name;
uint8_t gpio_pin;
gpio_dt_flags_t gpio_flags;
struct gpio_dt_spec int_gpio;
#endif
uint8_t whoami;
enum fxas21002_range range;
@ -72,8 +70,6 @@ struct fxas21002_data {
struct k_sem sem;
#ifdef CONFIG_FXAS21002_TRIGGER
const struct device *dev;
const struct device *gpio;
uint8_t gpio_pin;
struct gpio_callback gpio_cb;
sensor_trigger_handler_t drdy_handler;
#endif

29
drivers/sensor/fxas21002/fxas21002_trigger.c
View file

@ -16,13 +16,13 @@ static void fxas21002_gpio_callback(const struct device *dev,
{
struct fxas21002_data *data =
CONTAINER_OF(cb, struct fxas21002_data, gpio_cb);
const struct fxas21002_config *config = data->dev->config;
if ((pin_mask & BIT(data->gpio_pin)) == 0U) {
if ((pin_mask & BIT(config->int_gpio.pin)) == 0U) {
return;
}
gpio_pin_interrupt_configure(data->gpio, data->gpio_pin,
GPIO_INT_DISABLE);
gpio_pin_interrupt_configure_dt(&config->int_gpio, GPIO_INT_DISABLE);
#if defined(CONFIG_FXAS21002_TRIGGER_OWN_THREAD)
k_sem_give(&data->trig_sem);
@ -67,8 +67,7 @@ static void fxas21002_handle_int(const struct device *dev)
fxas21002_handle_drdy_int(dev);
}
gpio_pin_interrupt_configure(data->gpio, config->gpio_pin,
GPIO_INT_EDGE_TO_ACTIVE);
gpio_pin_interrupt_configure_dt(&config->int_gpio, GPIO_INT_EDGE_TO_ACTIVE);
}
#ifdef CONFIG_FXAS21002_TRIGGER_OWN_THREAD
@ -191,31 +190,25 @@ int fxas21002_trigger_init(const struct device *dev)
return -EIO;
}
/* Get the GPIO device */
data->gpio = device_get_binding(config->gpio_name);
if (data->gpio == NULL) {
LOG_ERR("Could not find GPIO device");
return -EINVAL;
if (!device_is_ready(config->int_gpio.port)) {
LOG_ERR("GPIO device not ready");
return -ENODEV;
}
data->gpio_pin = config->gpio_pin;
ret = gpio_pin_configure(data->gpio, config->gpio_pin,
GPIO_INPUT | config->gpio_flags);
ret = gpio_pin_configure_dt(&config->int_gpio, GPIO_INPUT);
if (ret < 0) {
return ret;
}
gpio_init_callback(&data->gpio_cb, fxas21002_gpio_callback,
BIT(config->gpio_pin));
BIT(config->int_gpio.pin));
ret = gpio_add_callback(data->gpio, &data->gpio_cb);
ret = gpio_add_callback(config->int_gpio.port, &data->gpio_cb);
if (ret < 0) {
return ret;
}
ret = gpio_pin_interrupt_configure(data->gpio, config->gpio_pin,
GPIO_INT_EDGE_TO_ACTIVE);
ret = gpio_pin_interrupt_configure_dt(&config->int_gpio, GPIO_INT_EDGE_TO_ACTIVE);
if (ret < 0) {
return ret;
}