diff --git a/arch/arm/include/nrf53/nrf5340_irq_cpuapp.h b/arch/arm/include/nrf53/nrf5340_irq_cpuapp.h index 5b0c7820b6f..c9466837bec 100644 --- a/arch/arm/include/nrf53/nrf5340_irq_cpuapp.h +++ b/arch/arm/include/nrf53/nrf5340_irq_cpuapp.h @@ -33,11 +33,11 @@ #define NRF53_IRQ_CACHE (NRF53_IRQ_EXTINT+1) /* CACHE interrupt */ #define NRF53_IRQ_SPU (NRF53_IRQ_EXTINT+3) /* SPU interrupt */ #define NRF53_IRQ_POWER_CLOCK (NRF53_IRQ_EXTINT+5) /* Power, Clock, Bprot */ -#define NRF53_IRQ_UART0 (NRF53_IRQ_EXTINT+8) /* UART/UARTE 0 */ -#define NRF53_IRQ_UART1 (NRF53_IRQ_EXTINT+9) /* UART/UARTE 1 */ +#define NRF53_IRQ_SERIAL0 (NRF53_IRQ_EXTINT+8) /* UART/SPI/TWI 0 */ +#define NRF53_IRQ_SERIAL1 (NRF53_IRQ_EXTINT+9) /* UART/SPI/TWI 1 */ #define NRF53_IRQ_SPIM4 (NRF53_IRQ_EXTINT+10) /* SPIM4 */ -#define NRF53_IRQ_UART2 (NRF53_IRQ_EXTINT+11) /* UART/UARTE 2 */ -#define NRF53_IRQ_UART3 (NRF53_IRQ_EXTINT+12) /* UART/UARTE 3 */ +#define NRF53_IRQ_SERIAL2 (NRF53_IRQ_EXTINT+11) /* UART/SPI/TWI 2 */ +#define NRF53_IRQ_SERIAL3 (NRF53_IRQ_EXTINT+12) /* UART/SPI/TWI 3 */ #define NRF53_IRQ_GPIOTE0 (NRF53_IRQ_EXTINT+13) /* GPIO Task & Event 0 */ #define NRF53_IRQ_SAADC (NRF53_IRQ_EXTINT+14) /* Analog to Digital Converter */ #define NRF53_IRQ_TIMER0 (NRF53_IRQ_EXTINT+15) /* Timer 0 */ diff --git a/arch/arm/include/nrf53/nrf5340_irq_cpunet.h b/arch/arm/include/nrf53/nrf5340_irq_cpunet.h index 010b114c760..b2997d74b47 100644 --- a/arch/arm/include/nrf53/nrf5340_irq_cpunet.h +++ b/arch/arm/include/nrf53/nrf5340_irq_cpunet.h @@ -40,7 +40,7 @@ #define NRF53_IRQ_TEMP (NRF53_IRQ_EXTINT+16) /* Temperature Sensor */ #define NRF53_IRQ_RTC0 (NRF53_IRQ_EXTINT+17) /* Real-time counter 0 */ #define NRF53_IRQ_IPC (NRF53_IRQ_EXTINT+18) /* IPC */ -#define NRF53_IRQ_UART0 (NRF53_IRQ_EXTINT+19) /* UART/UARTE 0 */ +#define NRF53_IRQ_SERIAL0 (NRF53_IRQ_EXTINT+19) /* UART/SPI/TWI 0 */ #define NRF53_IRQ_EGU0 (NRF53_IRQ_EXTINT+20) /* Event Gen. Unit 0 */ #define NRF53_IRQ_RTC1 (NRF53_IRQ_EXTINT+22) /* Real-time counter 1 */ #define NRF53_IRQ_TIMER1 (NRF53_IRQ_EXTINT+24) /* Timer 1 */ diff --git a/arch/arm/src/nrf53/nrf53_serial.c b/arch/arm/src/nrf53/nrf53_serial.c index 1d65981e736..efd8843ca1a 100644 --- a/arch/arm/src/nrf53/nrf53_serial.c +++ b/arch/arm/src/nrf53/nrf53_serial.c @@ -166,7 +166,7 @@ static char g_uart1txbuffer[CONFIG_UART1_TXBUFSIZE]; static struct nrf53_dev_s g_uart0priv = { .uartbase = NRF53_UART0_BASE, - .irq = NRF53_IRQ_UART0, + .irq = NRF53_IRQ_SERIAL0, .rx_available = false, .config = { @@ -208,7 +208,7 @@ static uart_dev_t g_uart0port = static struct nrf53_dev_s g_uart1priv = { .uartbase = NRF53_UART1_BASE, - .irq = NRF53_IRQ_UART1, + .irq = NRF53_IRQ_SERIAL1, .rx_available = false, .config = {