michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: bluetooth: hci: spi: 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 10:59:05 +01:00 • committed by Anas Nashif
commit b61df8281c
1 changed files with 19 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

53
drivers/bluetooth/hci/spi.c
View file

@ -47,11 +47,6 @@
#define CMD_OGF 1 #define CMD_OGF 1
#define CMD_OCF 2 #define CMD_OCF 2
#define GPIO_IRQ_PIN DT_INST_GPIO_PIN(0, irq_gpios)
#define GPIO_IRQ_FLAGS DT_INST_GPIO_FLAGS(0, irq_gpios)
#define GPIO_RESET_PIN DT_INST_GPIO_PIN(0, reset_gpios)
#define GPIO_RESET_FLAGS DT_INST_GPIO_FLAGS(0, reset_gpios)
/* Max SPI buffer length for transceive operations. /* Max SPI buffer length for transceive operations.
* *
* Buffer size needs to be at least the size of the larger RX/TX buffer * Buffer size needs to be at least the size of the larger RX/TX buffer
@ -64,8 +59,8 @@
static uint8_t rxmsg[SPI_MAX_MSG_LEN]; static uint8_t rxmsg[SPI_MAX_MSG_LEN];
static uint8_t txmsg[SPI_MAX_MSG_LEN]; static uint8_t txmsg[SPI_MAX_MSG_LEN];
static const struct device *irq_dev; static const struct gpio_dt_spec irq_gpio = GPIO_DT_SPEC_INST_GET(0, irq_gpios);
static const struct device *rst_dev; static const struct gpio_dt_spec rst_gpio = GPIO_DT_SPEC_INST_GET(0, reset_gpios);
static struct gpio_callback gpio_cb; static struct gpio_callback gpio_cb;
@ -208,7 +203,7 @@ static bool irq_pin_high(void)
{ {
int pin_state; int pin_state;
pin_state = gpio_pin_get(irq_dev, GPIO_IRQ_PIN); pin_state = gpio_pin_get_dt(&irq_gpio);
BT_DBG("IRQ Pin: %d", pin_state); BT_DBG("IRQ Pin: %d", pin_state);
@ -282,8 +277,7 @@ static void bt_spi_rx_thread(void)
k_sem_take(&sem_request, K_FOREVER); k_sem_take(&sem_request, K_FOREVER);
/* Disable IRQ pin callback to avoid spurious IRQs */ /* Disable IRQ pin callback to avoid spurious IRQs */
gpio_pin_interrupt_configure(irq_dev, GPIO_IRQ_PIN, gpio_pin_interrupt_configure_dt(&irq_gpio, GPIO_INT_DISABLE);
GPIO_INT_DISABLE);
k_sem_take(&sem_busy, K_FOREVER); k_sem_take(&sem_busy, K_FOREVER);
BT_DBG(""); BT_DBG("");
@ -307,8 +301,8 @@ static void bt_spi_rx_thread(void)
} }
release_cs(); release_cs();
gpio_pin_interrupt_configure(irq_dev, GPIO_IRQ_PIN, gpio_pin_interrupt_configure_dt(
GPIO_INT_EDGE_TO_ACTIVE); &irq_gpio, GPIO_INT_EDGE_TO_ACTIVE);
k_sem_give(&sem_busy); k_sem_give(&sem_busy);
@ -391,7 +385,7 @@ static int bt_spi_send(struct net_buf *buf)
/* Allow time for the read thread to handle interrupt */ /* Allow time for the read thread to handle interrupt */
while (true) { while (true) {
pending = gpio_pin_get(irq_dev, GPIO_IRQ_PIN); pending = gpio_pin_get_dt(&irq_gpio);
if (pending <= 0) { if (pending <= 0) {
break; break;
} }
@ -467,21 +461,18 @@ out:
static int bt_spi_open(void) static int bt_spi_open(void)
{ {
/* Configure RST pin and hold BLE in Reset */ /* Configure RST pin and hold BLE in Reset */
gpio_pin_configure(rst_dev, GPIO_RESET_PIN, gpio_pin_configure_dt(&rst_gpio, GPIO_OUTPUT_ACTIVE);
GPIO_OUTPUT_ACTIVE | GPIO_RESET_FLAGS);
/* Configure IRQ pin and the IRQ call-back/handler */ /* Configure IRQ pin and the IRQ call-back/handler */
gpio_pin_configure(irq_dev, GPIO_IRQ_PIN, gpio_pin_configure_dt(&irq_gpio, GPIO_INPUT);
GPIO_INPUT | GPIO_IRQ_FLAGS);
gpio_init_callback(&gpio_cb, bt_spi_isr, BIT(GPIO_IRQ_PIN)); gpio_init_callback(&gpio_cb, bt_spi_isr, BIT(irq_gpio.pin));
if (gpio_add_callback(irq_dev, &gpio_cb)) { if (gpio_add_callback(irq_gpio.port, &gpio_cb)) {
return -EINVAL; return -EINVAL;
} }
gpio_pin_interrupt_configure(irq_dev, GPIO_IRQ_PIN, gpio_pin_interrupt_configure_dt(&irq_gpio, GPIO_INT_EDGE_TO_ACTIVE);
GPIO_INT_EDGE_TO_ACTIVE);
/* Start RX thread */ /* Start RX thread */
k_thread_create(&spi_rx_thread_data, spi_rx_stack, k_thread_create(&spi_rx_thread_data, spi_rx_stack,
@ -491,7 +482,7 @@ static int bt_spi_open(void)
0, K_NO_WAIT); 0, K_NO_WAIT);
/* Take BLE out of reset */ /* Take BLE out of reset */
gpio_pin_set(rst_dev, GPIO_RESET_PIN, 0); gpio_pin_set_dt(&rst_gpio, 0);
/* Device will let us know when it's ready */ /* Device will let us know when it's ready */
k_sem_take(&sem_initialised, K_FOREVER); k_sem_take(&sem_initialised, K_FOREVER);
@ -522,20 +513,14 @@ static int bt_spi_init(const struct device *unused)
return -EIO; return -EIO;
} }
irq_dev = device_get_binding( if (!device_is_ready(irq_gpio.port)) {
DT_INST_GPIO_LABEL(0, irq_gpios)); BT_ERR("IRQ GPIO device not ready");
if (!irq_dev) { return -ENODEV;
BT_ERR("Failed to initialize GPIO driver: %s",
DT_INST_GPIO_LABEL(0, irq_gpios));
return -EIO;
} }
rst_dev = device_get_binding( if (!device_is_ready(rst_gpio.port)) {
DT_INST_GPIO_LABEL(0, reset_gpios)); BT_ERR("Reset GPIO device not ready");
if (!rst_dev) { return -ENODEV;
BT_ERR("Failed to initialize GPIO driver: %s",
DT_INST_GPIO_LABEL(0, reset_gpios));
return -EIO;
} }
bt_hci_driver_register(&drv); bt_hci_driver_register(&drv);