soc: nordic: Get rid of nrf_common.h

This file contains redundant definitions of a bunch of nRF IRQ numbers
(not all, however) that only generates confusion, as enumeration values
provided by MDK can be used instead.

Signed-off-by: Andrzej Głąbek <[email protected]>

Author: anangl

drivers/ieee802154/ieee802154_nrf5.c

@@ -347,9 +347,9 @@ static void nrf5_irq_config(struct device *dev)
 {
 	ARG_UNUSED(dev);
 
-	IRQ_CONNECT(NRF5_IRQ_RADIO_IRQn, NRF_802154_IRQ_PRIORITY,
+	IRQ_CONNECT(RADIO_IRQn, NRF_802154_IRQ_PRIORITY,
 		    nrf5_radio_irq, NULL, 0);
-	irq_enable(NRF5_IRQ_RADIO_IRQn);
+	irq_enable(RADIO_IRQn);
 }
 
 static int nrf5_init(struct device *dev)

soc/arm/nordic_nrf/CMakeLists.txt

@@ -1,7 +1,3 @@
 # SPDX-License-Identifier: Apache-2.0
 
-zephyr_include_directories(
-  include
-)
-
 add_subdirectory(${SOC_SERIES})

soc/arm/nordic_nrf/include/nrf_common.h

@@ -13,7 +13,6 @@
 
 #ifndef _ASMLANGUAGE
 
-#include <nrf_common.h>
 #include <nrfx.h>
 
 /* Add include for DTS generated information */

soc/arm/nordic_nrf/nrf51/soc.h

@@ -13,7 +13,6 @@
 
 #ifndef _ASMLANGUAGE
 
-#include <nrf_common.h>
 #include <nrfx.h>
 
 /* Add include for DTS generated information */

soc/arm/nordic_nrf/nrf52/soc.h

@@ -180,16 +180,16 @@ int ll_init(struct k_sem *sem_rx)
 		ll_filter_reset(true);
 	}
 
-	IRQ_DIRECT_CONNECT(NRF5_IRQ_RADIO_IRQn, CONFIG_BT_CTLR_WORKER_PRIO,
+	IRQ_DIRECT_CONNECT(RADIO_IRQn, CONFIG_BT_CTLR_WORKER_PRIO,
 			   radio_nrf5_isr, 0);
-	IRQ_CONNECT(NRF5_IRQ_RTC0_IRQn, CONFIG_BT_CTLR_WORKER_PRIO,
+	IRQ_CONNECT(RTC0_IRQn, CONFIG_BT_CTLR_WORKER_PRIO,
 		    rtc0_nrf5_isr, NULL, 0);
-	IRQ_CONNECT(NRF5_IRQ_SWI5_IRQn, CONFIG_BT_CTLR_JOB_PRIO, swi5_nrf5_isr,
-		    NULL, 0);
+	IRQ_CONNECT(SWI5_IRQn, CONFIG_BT_CTLR_JOB_PRIO,
+		    swi5_nrf5_isr, NULL, 0);
 
-	irq_enable(NRF5_IRQ_RADIO_IRQn);
-	irq_enable(NRF5_IRQ_RTC0_IRQn);
-	irq_enable(NRF5_IRQ_SWI5_IRQn);
+	irq_enable(RADIO_IRQn);
+	irq_enable(RTC0_IRQn);
+	irq_enable(SWI5_IRQn);
 
 	return 0;
 }

subsys/bluetooth/controller/ll_sw/ll.c

@@ -14,13 +14,13 @@ static inline void hal_swi_init(void)
 /* SW IRQs required for the nRF5 BLE Controller. */
 #if defined(CONFIG_BT_LL_SW_SPLIT)
 /* Split architecture uses max. two SWI */
-#define HAL_SWI_RADIO_IRQ  NRF5_IRQ_SWI4_IRQn
-#define HAL_SWI_WORKER_IRQ NRF5_IRQ_RTC0_IRQn
+#define HAL_SWI_RADIO_IRQ  SWI4_IRQn
+#define HAL_SWI_WORKER_IRQ RTC0_IRQn
 
 #if (CONFIG_BT_CTLR_ULL_HIGH_PRIO == CONFIG_BT_CTLR_ULL_LOW_PRIO)
 #define HAL_SWI_JOB_IRQ    HAL_SWI_WORKER_IRQ
 #else
-#define HAL_SWI_JOB_IRQ    NRF5_IRQ_SWI5_IRQn
+#define HAL_SWI_JOB_IRQ    SWI5_IRQn
 #endif
 
 static inline void hal_swi_lll_pend(void)
@@ -30,8 +30,8 @@ static inline void hal_swi_lll_pend(void)
 
 #elif defined(CONFIG_BT_LL_SW_LEGACY)
 /* Legacy controller uses max. one SWI */
-#define HAL_SWI_WORKER_IRQ NRF5_IRQ_RTC0_IRQn
-#define HAL_SWI_JOB_IRQ    NRF5_IRQ_SWI5_IRQn
+#define HAL_SWI_WORKER_IRQ RTC0_IRQn
+#define HAL_SWI_JOB_IRQ    SWI5_IRQn
 
 #else
 #error "CTRL architecture not defined"

subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/swi.h

@@ -155,9 +155,9 @@ int lll_init(void)
 	hal_swi_init();
 
 	/* Connect ISRs */
-	IRQ_DIRECT_CONNECT(NRF5_IRQ_RADIO_IRQn, CONFIG_BT_CTLR_LLL_PRIO,
+	IRQ_DIRECT_CONNECT(RADIO_IRQn, CONFIG_BT_CTLR_LLL_PRIO,
 			   radio_nrf5_isr, 0);
-	IRQ_CONNECT(NRF5_IRQ_RTC0_IRQn, CONFIG_BT_CTLR_ULL_HIGH_PRIO,
+	IRQ_CONNECT(RTC0_IRQn, CONFIG_BT_CTLR_ULL_HIGH_PRIO,
 		    rtc0_nrf5_isr, NULL, 0);
 	IRQ_CONNECT(HAL_SWI_RADIO_IRQ, CONFIG_BT_CTLR_LLL_PRIO,
 		    swi_lll_nrf5_isr, NULL, 0);
@@ -167,8 +167,8 @@ int lll_init(void)
 #endif
 
 	/* Enable IRQs */
-	irq_enable(NRF5_IRQ_RADIO_IRQn);
-	irq_enable(NRF5_IRQ_RTC0_IRQn);
+	irq_enable(RADIO_IRQn);
+	irq_enable(RTC0_IRQn);
 	irq_enable(HAL_SWI_RADIO_IRQ);
 #if (CONFIG_BT_CTLR_ULL_HIGH_PRIO != CONFIG_BT_CTLR_ULL_LOW_PRIO)
 	irq_enable(HAL_SWI_JOB_IRQ);