Skip to content

[TOPIC-GPIO] drivers: sensor: bmg160: convert to new GPIO API #22111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 24, 2020
Merged

[TOPIC-GPIO] drivers: sensor: bmg160: convert to new GPIO API #22111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion drivers/sensor/bmg160/bmg160.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,8 +332,9 @@ const struct bmg160_device_config bmg160_config = {
.i2c_addr = DT_INST_0_BOSCH_BMG160_BASE_ADDRESS,
.i2c_speed = BMG160_BUS_SPEED,
#ifdef CONFIG_BMG160_TRIGGER
.gpio_port = DT_INST_0_BOSCH_BMG160_INT_GPIOS_CONTROLLER,
.int_pin = DT_INST_0_BOSCH_BMG160_INT_GPIOS_PIN,
.int_flags = DT_INST_0_BOSCH_BMG160_INT_GPIOS_FLAGS,
.gpio_port = DT_INST_0_BOSCH_BMG160_INT_GPIOS_CONTROLLER,
#endif
};

Expand Down
7 changes: 3 additions & 4 deletions drivers/sensor/bmg160/bmg160.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,12 @@

struct bmg160_device_config {
const char *i2c_port;
#ifdef CONFIG_BMG160_TRIGGER
const char *gpio_port;
#endif
u16_t i2c_addr;
u8_t i2c_speed;
#ifdef CONFIG_BMG160_TRIGGER
u8_t int_pin;
gpio_pin_t int_pin;
gpio_devicetree_flags_t int_flags;
const char *gpio_port;
#endif
};

Expand Down
19 changes: 16 additions & 3 deletions drivers/sensor/bmg160/bmg160_trigger.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,20 @@ extern struct bmg160_device_data bmg160_data;
#include <logging/log.h>
LOG_MODULE_DECLARE(BMG160, CONFIG_SENSOR_LOG_LEVEL);

static inline void setup_int(struct device *dev,
bool enable)
{
struct bmg160_device_data *data = dev->driver_data;
const struct bmg160_device_config *const cfg =
dev->config->config_info;

gpio_pin_interrupt_configure(data->gpio,
cfg->int_pin,
enable
? GPIO_INT_EDGE_TO_ACTIVE
: GPIO_INT_DISABLE);
}

static void bmg160_gpio_callback(struct device *port, struct gpio_callback *cb,
u32_t pin)
{
Expand Down Expand Up @@ -244,12 +258,11 @@ int bmg160_trigger_init(struct device *dev)
#endif

gpio_pin_configure(bmg160->gpio, cfg->int_pin,
GPIO_DIR_IN | GPIO_INT | GPIO_INT_EDGE |
GPIO_INT_ACTIVE_LOW | GPIO_INT_DEBOUNCE);
cfg->int_flags | GPIO_INT_EDGE_TO_ACTIVE);
gpio_init_callback(&bmg160->gpio_cb, bmg160_gpio_callback,
BIT(cfg->int_pin));
gpio_add_callback(bmg160->gpio, &bmg160->gpio_cb);
gpio_pin_enable_callback(bmg160->gpio, cfg->int_pin);
setup_int(dev, true);

return 0;
}