diff --git a/drivers/wifi/esp/esp.c b/drivers/wifi/esp/esp.c index 34e2468d57d..50ddc443392 100644 --- a/drivers/wifi/esp/esp.c +++ b/drivers/wifi/esp/esp.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ +#define DT_DRV_COMPAT espressif_esp_wifi + #define LOG_LEVEL CONFIG_WIFI_LOG_LEVEL #include LOG_MODULE_REGISTER(wifi_esp); @@ -26,16 +28,16 @@ LOG_MODULE_REGISTER(wifi_esp); /* pin settings */ enum modem_control_pins { -#if defined(DT_INST_0_ESPRESSIF_ESP_WIFI_RESET_GPIOS_PIN) +#if DT_INST_NODE_HAS_PROP(0, reset_gpios) WIFI_RESET, #endif NUM_PINS, }; static struct modem_pin modem_pins[] = { -#if defined(DT_INST_0_ESPRESSIF_ESP_WIFI_RESET_GPIOS_PIN) - MODEM_PIN(DT_INST_0_ESPRESSIF_ESP_WIFI_RESET_GPIOS_CONTROLLER, - DT_INST_0_ESPRESSIF_ESP_WIFI_RESET_GPIOS_PIN, +#if DT_INST_NODE_HAS_PROP(0, reset_gpios) + MODEM_PIN(DT_INST_GPIO_LABEL(0, reset_gpios), + DT_INST_GPIO_PIN(0, reset_gpios), GPIO_OUTPUT), #endif }; @@ -742,7 +744,7 @@ static void esp_reset(struct esp_data *dev) net_if_down(dev->net_iface); } -#if defined(DT_INST_0_ESPRESSIF_ESP_WIFI_RESET_GPIOS_PIN) +#if DT_INST_NODE_HAS_PROP(0, reset_gpios) modem_pin_write(&dev->mctx, WIFI_RESET, 0); k_sleep(K_MSEC(100)); modem_pin_write(&dev->mctx, WIFI_RESET, 1); @@ -838,7 +840,7 @@ static int esp_init(struct device *dev) data->iface_data.rx_rb_buf = &data->iface_rb_buf[0]; data->iface_data.rx_rb_buf_len = sizeof(data->iface_rb_buf); ret = modem_iface_uart_init(&data->mctx.iface, &data->iface_data, - DT_INST_0_ESPRESSIF_ESP_BUS_NAME); + DT_INST_BUS_LABEL(0)); if (ret < 0) { goto error; } diff --git a/drivers/wifi/esp/esp.h b/drivers/wifi/esp/esp.h index 56a72163a08..e28a37c0aa9 100644 --- a/drivers/wifi/esp/esp.h +++ b/drivers/wifi/esp/esp.h @@ -37,14 +37,14 @@ extern "C" { #define _CIPSTAMAC "CIPSTAMAC" #endif -#if DT_INST_0_ESPRESSIF_ESP_WIFI_UART_FLOW_CONTROL == 1 +#if DT_INST_PROP(0, uart_flow_control) == 1 #define _FLOW_CONTROL "3" #else #define _FLOW_CONTROL "0" #endif #define _UART_CUR \ - STRINGIFY(DT_INST_0_ESPRESSIF_ESP_WIFI_UART_SPEED)",8,1,0,"_FLOW_CONTROL + STRINGIFY(DT_INST_PROP(0, uart_speed))",8,1,0,"_FLOW_CONTROL #define CONN_CMD_MAX_LEN (sizeof("AT+"_CWJAP"=\"\",\"\"") + \ WIFI_SSID_MAX_LEN + WIFI_PSK_MAX_LEN)