michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: ieee802154: dw1000: 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-01-31 23:11:40 +01:00 • committed by Anas Nashif
commit adf8e4d723
1 changed files with 22 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

64
drivers/ieee802154/ieee802154_dw1000.c
View file

@ -91,12 +91,8 @@ struct dwt_phy_config {
struct dwt_hi_cfg { struct dwt_hi_cfg {
struct spi_dt_spec bus; struct spi_dt_spec bus;
const char *irq_port; struct gpio_dt_spec irq_gpio;
uint8_t irq_pin; struct gpio_dt_spec rst_gpio;
gpio_dt_flags_t irq_flags;
const char *rst_port;
uint8_t rst_pin;
gpio_dt_flags_t rst_flags;
}; };
#define DWT_STATE_TX 0 #define DWT_STATE_TX 0
@ -106,8 +102,6 @@ struct dwt_hi_cfg {
struct dwt_context { struct dwt_context {
const struct device *dev; const struct device *dev;
struct net_if *iface; struct net_if *iface;
const struct device *irq_gpio;
const struct device *rst_gpio;
const struct spi_config *spi_cfg; const struct spi_config *spi_cfg;
struct spi_config spi_cfg_slow; struct spi_config spi_cfg_slow;
struct gpio_callback gpio_cb; struct gpio_callback gpio_cb;
@ -124,12 +118,8 @@ struct dwt_context {
static const struct dwt_hi_cfg dw1000_0_config = { static const struct dwt_hi_cfg dw1000_0_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_port = DT_INST_GPIO_LABEL(0, int_gpios), .irq_gpio = GPIO_DT_SPEC_INST_GET(0, int_gpios),
.irq_pin = DT_INST_GPIO_PIN(0, int_gpios), .rst_gpio = GPIO_DT_SPEC_INST_GET(0, reset_gpios),
.irq_flags = DT_INST_GPIO_FLAGS(0, int_gpios),
.rst_port = DT_INST_GPIO_LABEL(0, reset_gpios),
.rst_pin = DT_INST_GPIO_PIN(0, reset_gpios),
.rst_flags = DT_INST_GPIO_FLAGS(0, reset_gpios),
}; };
static struct dwt_context dwt_0_context = { static struct dwt_context dwt_0_context = {
@ -331,16 +321,13 @@ static inline void dwt_reg_write_u8(const struct device *dev,
static ALWAYS_INLINE void dwt_setup_int(const struct device *dev, static ALWAYS_INLINE void dwt_setup_int(const struct device *dev,
bool enable) bool enable)
{ {
struct dwt_context *ctx = dev->data;
const struct dwt_hi_cfg *hi_cfg = dev->config; const struct dwt_hi_cfg *hi_cfg = dev->config;
unsigned int flags = enable unsigned int flags = enable
? GPIO_INT_EDGE_TO_ACTIVE ? GPIO_INT_EDGE_TO_ACTIVE
: GPIO_INT_DISABLE; : GPIO_INT_DISABLE;
gpio_pin_interrupt_configure(ctx->irq_gpio, gpio_pin_interrupt_configure_dt(&hi_cfg->irq_gpio, flags);
hi_cfg->irq_pin,
flags);
} }
static void dwt_reset_rfrx(const struct device *dev) static void dwt_reset_rfrx(const struct device *dev)
@ -958,22 +945,19 @@ static int dwt_configure(const struct device *dev,
*/ */
static int dwt_hw_reset(const struct device *dev) static int dwt_hw_reset(const struct device *dev)
{ {
struct dwt_context *ctx = dev->data;
const struct dwt_hi_cfg *hi_cfg = dev->config; const struct dwt_hi_cfg *hi_cfg = dev->config;
if (gpio_pin_configure(ctx->rst_gpio, hi_cfg->rst_pin, if (gpio_pin_configure_dt(&hi_cfg->rst_gpio, GPIO_OUTPUT_ACTIVE)) {
GPIO_OUTPUT_ACTIVE | hi_cfg->rst_flags)) { LOG_ERR("Failed to configure GPIO pin %u", hi_cfg->rst_gpio.pin);
LOG_ERR("Failed to configure GPIO pin %u", hi_cfg->rst_pin);
return -EINVAL; return -EINVAL;
} }
k_sleep(K_MSEC(1)); k_sleep(K_MSEC(1));
gpio_pin_set(ctx->rst_gpio, hi_cfg->rst_pin, 0); gpio_pin_set_dt(&hi_cfg->rst_gpio, 0);
k_sleep(K_MSEC(5)); k_sleep(K_MSEC(5));
if (gpio_pin_configure(ctx->rst_gpio, hi_cfg->rst_pin, if (gpio_pin_configure_dt(&hi_cfg->rst_gpio, GPIO_INPUT)) {
GPIO_INPUT | hi_cfg->rst_flags)) { LOG_ERR("Failed to configure GPIO pin %u", hi_cfg->rst_gpio.pin);
LOG_ERR("Failed to configure GPIO pin %u", hi_cfg->rst_pin);
return -EINVAL; return -EINVAL;
} }
@ -1518,36 +1502,32 @@ static int dw1000_init(const struct device *dev)
dwt_set_spi_slow(dev, DWT_SPI_SLOW_FREQ); dwt_set_spi_slow(dev, DWT_SPI_SLOW_FREQ);
/* Initialize IRQ GPIO */ /* Initialize IRQ GPIO */
ctx->irq_gpio = device_get_binding((char *)hi_cfg->irq_port); if (!device_is_ready(hi_cfg->irq_gpio.port)) {
if (!ctx->irq_gpio) { LOG_ERR("IRQ GPIO device not ready");
LOG_ERR("GPIO port %s not found", hi_cfg->irq_port); return -ENODEV;
return -EINVAL;
} }
if (gpio_pin_configure(ctx->irq_gpio, hi_cfg->irq_pin, if (gpio_pin_configure_dt(&hi_cfg->irq_gpio, GPIO_INPUT)) {
GPIO_INPUT | hi_cfg->irq_flags)) { LOG_ERR("Unable to configure GPIO pin %u", hi_cfg->irq_gpio.pin);
LOG_ERR("Unable to configure GPIO pin %u", hi_cfg->irq_pin);
return -EINVAL; return -EINVAL;
} }
gpio_init_callback(&(ctx->gpio_cb), dwt_gpio_callback, gpio_init_callback(&(ctx->gpio_cb), dwt_gpio_callback,
BIT(hi_cfg->irq_pin)); BIT(hi_cfg->irq_gpio.pin));
if (gpio_add_callback(ctx->irq_gpio, &(ctx->gpio_cb))) { if (gpio_add_callback(hi_cfg->irq_gpio.port, &(ctx->gpio_cb))) {
LOG_ERR("Failed to add IRQ callback"); LOG_ERR("Failed to add IRQ callback");
return -EINVAL; return -EINVAL;
} }
/* Initialize RESET GPIO */ /* Initialize RESET GPIO */
ctx->rst_gpio = device_get_binding(hi_cfg->rst_port); if (!device_is_ready(hi_cfg->rst_gpio.port)) {
if (ctx->rst_gpio == NULL) { LOG_ERR("Reset GPIO device not ready");
LOG_ERR("Could not get GPIO port for RESET"); return -ENODEV;
return -EIO;
} }
if (gpio_pin_configure(ctx->rst_gpio, hi_cfg->rst_pin, if (gpio_pin_configure_dt(&hi_cfg->rst_gpio, GPIO_INPUT)) {
GPIO_INPUT | hi_cfg->rst_flags)) { LOG_ERR("Unable to configure GPIO pin %u", hi_cfg->rst_gpio.pin);
LOG_ERR("Unable to configure GPIO pin %u", hi_cfg->rst_pin);
return -EINVAL; return -EINVAL;
} }