Skip to content

Commit 9e9d5e2

Browse files
committed
Bluetooth: Controller: Align DDPI usage with nRF54L power domains
Align DDPI usage with nRF54L series power domains and available DDPI configurations. Use indices below 4 when needing to bridge with GPIO, use indices below 8 when needing to bridge with MCU domain like CCM and AAR; and use indices above 7 to bridge with Peripheral domain. Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
1 parent 9fbe374 commit 9e9d5e2

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi_resources.h

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,35 +8,35 @@
88
* Enable Radio on Event Timer tick:
99
* wire the EVENT_TIMER EVENTS_COMPARE[0] event to RADIO TASKS_TXEN/RXEN task.
1010
*/
11-
#define HAL_RADIO_ENABLE_TX_ON_TICK_PPI 6
12-
#define HAL_RADIO_ENABLE_RX_ON_TICK_PPI 6
11+
#define HAL_RADIO_ENABLE_TX_ON_TICK_PPI 9
12+
#define HAL_RADIO_ENABLE_RX_ON_TICK_PPI 9
1313

1414
/*******************************************************************************
1515
* Capture event timer on Address reception:
1616
* wire the RADIO EVENTS_ADDRESS event to the
1717
* EVENT_TIMER TASKS_CAPTURE[<address timer>] task.
1818
*/
19-
#define HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI 9
19+
#define HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI 7
2020

2121
/*******************************************************************************
2222
* Disable Radio on HCTO:
2323
* wire the EVENT_TIMER EVENTS_COMPARE[<HCTO timer>] event
2424
* to the RADIO TASKS_DISABLE task.
2525
*/
26-
#define HAL_RADIO_DISABLE_ON_HCTO_PPI 10
26+
#define HAL_RADIO_DISABLE_ON_HCTO_PPI 11
2727

2828
/*******************************************************************************
2929
* Capture event timer on Radio end:
3030
* wire the RADIO EVENTS_END event to the
3131
* EVENT_TIMER TASKS_CAPTURE[<radio end timer>] task.
3232
*/
33-
#define HAL_RADIO_END_TIME_CAPTURE_PPI 11
33+
#define HAL_RADIO_END_TIME_CAPTURE_PPI 12
3434

3535
/*******************************************************************************
3636
* Start event timer on RTC tick:
3737
* wire the RTC0 EVENTS_COMPARE[2] event to EVENT_TIMER TASKS_START task.
3838
*/
39-
#define HAL_EVENT_TIMER_START_PPI 7
39+
#define HAL_EVENT_TIMER_START_PPI 8
4040
#define HAL_PPIB_SEND_EVENT_TIMER_START_PPI \
4141
_CONCAT(NRF_PPIB_TASK_SEND_, HAL_EVENT_TIMER_START_PPI)
4242
#define HAL_PPIB_RECEIVE_EVENT_TIMER_START_PPI \
@@ -47,7 +47,7 @@
4747
* wire the RADIO EVENTS_READY event to the
4848
* EVENT_TIMER TASKS_CAPTURE[<radio ready timer>] task.
4949
*/
50-
#define HAL_RADIO_READY_TIME_CAPTURE_PPI 8
50+
#define HAL_RADIO_READY_TIME_CAPTURE_PPI 10
5151

5252
/*******************************************************************************
5353
* Trigger encryption task upon address reception:
@@ -62,27 +62,27 @@
6262
* Trigger automatic address resolution on Bit counter match:
6363
* wire the RADIO EVENTS_BCMATCH event to the AAR TASKS_START task.
6464
*/
65-
#define HAL_TRIGGER_AAR_PPI 12
65+
#define HAL_TRIGGER_AAR_PPI 6
6666

6767
#if defined(CONFIG_BT_CTLR_PHY_CODED) && \
6868
defined(CONFIG_HAS_HW_NRF_RADIO_BLE_CODED)
6969
/*******************************************************************************
7070
* Trigger Radio Rate override upon Rateboost event.
7171
*/
72-
#define HAL_TRIGGER_RATEOVERRIDE_PPI 13
72+
#define HAL_TRIGGER_RATEOVERRIDE_PPI 5
7373
#endif /* CONFIG_BT_CTLR_PHY_CODED && CONFIG_HAS_HW_NRF_RADIO_BLE_CODED */
7474

7575
#if defined(HAL_RADIO_GPIO_HAVE_PA_PIN) || defined(HAL_RADIO_GPIO_HAVE_LNA_PIN)
7676
/******************************************************************************/
77-
#define HAL_ENABLE_PALNA_PPI 5
77+
#define HAL_ENABLE_PALNA_PPI 3
7878

7979
#if defined(HAL_RADIO_FEM_IS_NRF21540)
80-
#define HAL_DISABLE_PALNA_PPI 4
80+
#define HAL_DISABLE_PALNA_PPI 1
8181
#else
8282
#define HAL_DISABLE_PALNA_PPI HAL_ENABLE_PALNA_PPI
8383
#endif
8484

85-
#define HAL_ENABLE_FEM_PPI 3
85+
#define HAL_ENABLE_FEM_PPI 2
8686
#define HAL_DISABLE_FEM_PPI HAL_DISABLE_PALNA_PPI
8787

8888
#endif /* HAL_RADIO_GPIO_HAVE_PA_PIN || HAL_RADIO_GPIO_HAVE_LNA_PIN */
@@ -107,10 +107,10 @@
107107

108108
/* Wire a SW SWITCH TIMER EVENTS_COMPARE[<cc_offset>] event
109109
* to a PPI GROUP TASK DISABLE task (PPI group with index <index>).
110-
* 2 adjacent PPIs (14 & 15) and 2 adjacent PPI groups are used for this wiring;
110+
* 2 adjacent PPIs (13 & 14) and 2 adjacent PPI groups are used for this wiring;
111111
* <index> must be 0 or 1. <offset> must be a valid TIMER CC register offset.
112112
*/
113-
#define HAL_SW_SWITCH_GROUP_TASK_DISABLE_PPI_BASE 14
113+
#define HAL_SW_SWITCH_GROUP_TASK_DISABLE_PPI_BASE 13
114114

115115
/* Enable the SW Switch PPI Group on RADIO END Event.
116116
*
@@ -130,7 +130,7 @@
130130
* We use the same PPI for the alternative SW Switch Timer compare
131131
* event.
132132
*/
133-
#define HAL_SW_SWITCH_RADIO_ENABLE_PPI_BASE 14
133+
#define HAL_SW_SWITCH_RADIO_ENABLE_PPI_BASE 13
134134

135135
#if defined(CONFIG_BT_CTLR_PHY_CODED) && \
136136
defined(CONFIG_HAS_HW_NRF_RADIO_BLE_CODED)
@@ -151,7 +151,7 @@
151151
/* Cancel the SW switch timer running considering PHYEND delay compensation timing:
152152
* wire the RADIO EVENTS_CTEPRESENT event to SW_SWITCH_TIMER TASKS_CAPTURE task.
153153
*/
154-
#define HAL_SW_SWITCH_TIMER_PHYEND_DELAY_COMPENSATION_DISABLE_PPI 16
154+
#define HAL_SW_SWITCH_TIMER_PHYEND_DELAY_COMPENSATION_DISABLE_PPI 15
155155
#endif /* CONFIG_BT_CTLR_DF_PHYEND_OFFSET_COMPENSATION_ENABLE */
156156

157157
#if defined(CONFIG_BT_CTLR_DF_CONN_CTE_RX)
@@ -162,7 +162,7 @@
162162
* when direction finding RX and PHY is set to PHY1M. Due to that it can be shared with Radio Rate
163163
* override.
164164
*/
165-
#define HAL_TRIGGER_CRYPT_DELAY_PPI 13
165+
#define HAL_TRIGGER_CRYPT_DELAY_PPI 5
166166
#endif /* CONFIG_BT_CTLR_DF_CONN_CTE_RX */
167167

168168
/* The 2 adjacent PPI groups used for implementing SW_SWITCH_TIMER-based

0 commit comments

Comments
 (0)