Skip to content

Commit

Permalink
Bluetooth: controller: nRF53x: SWI mapping should use SOC define
Browse files Browse the repository at this point in the history
SWI IRQ line mapping for nRF5340 shall use
CONFIG_SOC_NRF5340_CPUNET for conditional compilation
instead of the board define, so as to allow new boards to
use the BLE controller implementation.

Fixes zephyrproject-rtos#30488.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
  • Loading branch information
cvinayak authored and carlescufi committed Jan 6, 2021
1 parent d7c2f8a commit db5270b
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/swi.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

/* nRF51 and nRF52 Series IRQ mapping*/
#if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_COMPATIBLE_NRF52X)

#define HAL_SWI_RADIO_IRQ SWI4_IRQn
Expand All @@ -16,9 +17,12 @@
#define HAL_SWI_JOB_IRQ SWI5_IRQn
#endif

/* nRF53 Series IRQ mapping */
#elif defined(CONFIG_SOC_SERIES_NRF53X)

#if defined(CONFIG_BOARD_NRF5340DK_NRF5340_CPUNET)
/* nRF53 Series Engineering D and Revision 1 IRQ mapping */
#if defined(CONFIG_SOC_NRF5340_CPUNET) && \
!defined(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUNET)

#define HAL_SWI_RADIO_IRQ SWI2_IRQn
#define HAL_SWI_WORKER_IRQ RTC0_IRQn
Expand All @@ -30,8 +34,10 @@
#define HAL_SWI_JOB_IRQ SWI3_IRQn
#endif

/* nRF53 Series Engineering A IRQ mapping */
#elif defined(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUNET)

/* NOTE: nRF5340 Engineering A Errata [29] SWI: SWIRQ is not functional */
#define HAL_SWI_RADIO_IRQ EGU0_IRQn
#define HAL_SWI_WORKER_IRQ RTC0_IRQn

Expand Down

0 comments on commit db5270b

Please sign in to comment.