From b99ee328f85a8cc1c77c00e12b3c27211153039a Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Tue, 24 Mar 2020 19:37:52 -0500 Subject: [PATCH] drivers: serial: esp32: rename fake DT define Rename DT_INST_{0,1,2}_ESPRESSIF_ESP32_UART_IRQ_0 defines to something non-DT prefixed. This way we know which defines are one's we generate and which ones are driver created. It should be easy enough to replace these INST_{0,1,2}_ESPRESSIF_ESP32_UART_IRQ_0 define with DTS generated one macros once esp32 has interrupt controller support in DTS. Signed-off-by: Kumar Gala --- drivers/serial/uart_esp32.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/serial/uart_esp32.c b/drivers/serial/uart_esp32.c index fe17b827dc6..6938db1bbfc 100644 --- a/drivers/serial/uart_esp32.c +++ b/drivers/serial/uart_esp32.c @@ -117,9 +117,9 @@ struct uart_esp32_data { #define UART_GET_RX_FLOW(conf1_reg) ((conf1_reg >> 23) & 0x1) /* FIXME: This should be removed when interrupt support added to ESP32 dts */ -#define DT_INST_0_ESPRESSIF_ESP32_UART_IRQ_0 12 -#define DT_INST_1_ESPRESSIF_ESP32_UART_IRQ_0 17 -#define DT_INST_2_ESPRESSIF_ESP32_UART_IRQ_0 18 +#define INST_0_ESPRESSIF_ESP32_UART_IRQ_0 12 +#define INST_1_ESPRESSIF_ESP32_UART_IRQ_0 17 +#define INST_2_ESPRESSIF_ESP32_UART_IRQ_0 18 /* ESP-IDF Naming is not consistent for UART0 with UART1/2 */ #define DPORT_UART0_CLK_EN DPORT_UART_CLK_EN @@ -461,13 +461,13 @@ static const struct uart_driver_api uart_esp32_api = { static void uart_esp32_irq_config_func_##idx(struct device *dev) \ { \ esp32_rom_intr_matrix_set(0, ETS_UART##idx##_INTR_SOURCE, \ - DT_INST_##idx##_ESPRESSIF_ESP32_UART_IRQ_0); \ - IRQ_CONNECT(DT_INST_##idx##_ESPRESSIF_ESP32_UART_IRQ_0, \ + INST_##idx##_ESPRESSIF_ESP32_UART_IRQ_0); \ + IRQ_CONNECT(INST_##idx##_ESPRESSIF_ESP32_UART_IRQ_0, \ 1, \ uart_esp32_isr, \ DEVICE_GET(uart_esp32_##idx), \ 0); \ - irq_enable(DT_INST_##idx##_ESPRESSIF_ESP32_UART_IRQ_0); \ + irq_enable(INST_##idx##_ESPRESSIF_ESP32_UART_IRQ_0); \ } #else #define ESP32_UART_IRQ_HANDLER_DECL(idx) @@ -510,7 +510,7 @@ static const struct uart_esp32_config uart_esp32_cfg_port_##idx = { \ \ .irq = { \ .source = ETS_UART##idx##_INTR_SOURCE, \ - .line = DT_INST_##idx##_ESPRESSIF_ESP32_UART_IRQ_0, \ + .line = INST_##idx##_ESPRESSIF_ESP32_UART_IRQ_0, \ } \ }; \ \