michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: ieee802154: mcr20a: use gpio_dt_spec

Browse source 
Simplify driver implementation by using gpio_dt_spec.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2022-02-01 00:26:51 +01:00 • committed by Anas Nashif
commit ec63ea78cd
2 changed files with 21 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

52
drivers/ieee802154/ieee802154_mcr20a.c
View file

@ -804,24 +804,23 @@ static inline void irqb_int_handler(const struct device *port,
static void enable_irqb_interrupt(const struct device *dev, static void enable_irqb_interrupt(const struct device *dev,
bool enable) bool enable)
{ {
struct mcr20a_context *mcr20a = dev->data; const struct mcr20a_config *config = dev->config;
gpio_flags_t flags = enable gpio_flags_t flags = enable
? GPIO_INT_EDGE_TO_ACTIVE ? GPIO_INT_EDGE_TO_ACTIVE
: GPIO_INT_DISABLE; : GPIO_INT_DISABLE;
gpio_pin_interrupt_configure(mcr20a->irq_gpio, gpio_pin_interrupt_configure_dt(&config->irq_gpio, flags);
DT_INST_GPIO_PIN(0, irqb_gpios),
flags);
} }
static inline void setup_gpio_callbacks(const struct device *dev) static inline void setup_gpio_callbacks(const struct device *dev)
{ {
const struct mcr20a_config *config = dev->config;
struct mcr20a_context *mcr20a = dev->data; struct mcr20a_context *mcr20a = dev->data;
gpio_init_callback(&mcr20a->irqb_cb, gpio_init_callback(&mcr20a->irqb_cb,
irqb_int_handler, irqb_int_handler,
BIT(DT_INST_GPIO_PIN(0, irqb_gpios))); BIT(config->irq_gpio.pin));
gpio_add_callback(mcr20a->irq_gpio, &mcr20a->irqb_cb); gpio_add_callback(config->irq_gpio.port, &mcr20a->irqb_cb);
} }
static int mcr20a_set_cca_mode(const struct device *dev, uint8_t mode) static int mcr20a_set_cca_mode(const struct device *dev, uint8_t mode)
@ -1281,23 +1280,20 @@ error:
static int power_on_and_setup(const struct device *dev) static int power_on_and_setup(const struct device *dev)
{ {
struct mcr20a_context *mcr20a = dev->data; const struct mcr20a_config *config = dev->config;
uint8_t timeout = 6U; uint8_t timeout = 6U;
int pin; int pin;
uint8_t tmp = 0U; uint8_t tmp = 0U;
if (!PART_OF_KW2XD_SIP) { if (!PART_OF_KW2XD_SIP) {
gpio_pin_set(mcr20a->reset_gpio, gpio_pin_set_dt(&config->reset_gpio, 1);
DT_INST_GPIO_PIN(0, reset_gpios), 1);
z_usleep(150); z_usleep(150);
gpio_pin_set(mcr20a->reset_gpio, gpio_pin_set_dt(&config->reset_gpio, 0);
DT_INST_GPIO_PIN(0, reset_gpios), 0);
do { do {
z_usleep(50); z_usleep(50);
timeout--; timeout--;
pin = gpio_pin_get(mcr20a->irq_gpio, pin = gpio_pin_get_dt(&config->irq_gpio);
DT_INST_GPIO_PIN(0, irqb_gpios));
} while (pin > 0 && timeout); } while (pin > 0 && timeout);
if (pin) { if (pin) {
@ -1347,36 +1343,24 @@ static int power_on_and_setup(const struct device *dev)
static inline int configure_gpios(const struct device *dev) static inline int configure_gpios(const struct device *dev)
{ {
struct mcr20a_context *mcr20a = dev->data; const struct mcr20a_config *config = dev->config;
/* setup gpio for the modem interrupt */ /* setup gpio for the modem interrupt */
mcr20a->irq_gpio = if (!device_is_ready(config->irq_gpio.port)) {
device_get_binding(DT_INST_GPIO_LABEL(0, irqb_gpios)); LOG_ERR("IRQ GPIO device not ready");
if (mcr20a->irq_gpio == NULL) { return -ENODEV;
LOG_ERR("Failed to get pointer to %s device",
DT_INST_GPIO_LABEL(0, irqb_gpios));
return -EINVAL;
} }
gpio_pin_configure(mcr20a->irq_gpio, gpio_pin_configure_dt(&config->irq_gpio, GPIO_INPUT);
DT_INST_GPIO_PIN(0, irqb_gpios),
GPIO_INPUT | DT_INST_GPIO_FLAGS(0, irqb_gpios));
if (!PART_OF_KW2XD_SIP) { if (!PART_OF_KW2XD_SIP) {
/* setup gpio for the modems reset */ /* setup gpio for the modems reset */
mcr20a->reset_gpio = if (!device_is_ready(config->reset_gpio.port)) {
device_get_binding( LOG_ERR("Reset GPIO device not ready");
DT_INST_GPIO_LABEL(0, reset_gpios));
if (mcr20a->reset_gpio == NULL) {
LOG_ERR("Failed to get pointer to %s device",
DT_INST_GPIO_LABEL(0, reset_gpios));
return -EINVAL; return -EINVAL;
} }
gpio_pin_configure(mcr20a->reset_gpio, gpio_pin_configure_dt(&config->reset_gpio, GPIO_OUTPUT_ACTIVE);
DT_INST_GPIO_PIN(0, reset_gpios),
GPIO_OUTPUT_ACTIVE |
DT_INST_GPIO_FLAGS(0, reset_gpios));
} }
return 0; return 0;
@ -1435,6 +1419,8 @@ static void mcr20a_iface_init(struct net_if *iface)
static const struct mcr20a_config mcr20a_config = { static const struct mcr20a_config mcr20a_config = {
.bus = SPI_DT_SPEC_INST_GET(0, SPI_WORD_SET(8), 0), .bus = SPI_DT_SPEC_INST_GET(0, SPI_WORD_SET(8), 0),
.irq_gpio = GPIO_DT_SPEC_INST_GET(0, irqb_gpios),
.reset_gpio = GPIO_DT_SPEC_INST_GET(0, reset_gpios),
}; };
static struct mcr20a_context mcr20a_context_data; static struct mcr20a_context mcr20a_context_data;

4
drivers/ieee802154/ieee802154_mcr20a.h
View file

@ -16,6 +16,8 @@
struct mcr20a_config { struct mcr20a_config {
struct spi_dt_spec bus; struct spi_dt_spec bus;
struct gpio_dt_spec irq_gpio;
struct gpio_dt_spec reset_gpio;
}; };
/* Runtime context structure /* Runtime context structure
@ -24,8 +26,6 @@ struct mcr20a_config {
struct mcr20a_context { struct mcr20a_context {
struct net_if *iface; struct net_if *iface;
/**************************/ /**************************/
const struct device *irq_gpio;
const struct device *reset_gpio;
struct gpio_callback irqb_cb; struct gpio_callback irqb_cb;
const struct device *spi; const struct device *spi;
struct spi_config spi_cfg; struct spi_config spi_cfg;