Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions applications/connectivity_bridge/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ CONFIG_UART_0_NRF_HW_ASYNC_TIMER=1
CONFIG_UART_1_NRF_HW_ASYNC_TIMER=2
CONFIG_UART_USE_RUNTIME_CONFIGURE=y
CONFIG_NRFX_UARTE=y
CONFIG_NRFX_TIMER1=y
CONFIG_NRFX_TIMER2=y
CONFIG_NRFX_TIMER=y
CONFIG_NRFX_PPI=y

CONFIG_HW_ID_LIBRARY=y
Expand Down
2 changes: 1 addition & 1 deletion applications/nrf5340_audio/src/audio/Kconfig.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#

# Audio sync timer
config NRFX_TIMER1
config NRFX_TIMER
default y

# Audio sync timer
Expand Down
4 changes: 2 additions & 2 deletions applications/nrf5340_audio/src/modules/audio_sync_timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ LOG_MODULE_REGISTER(audio_sync_timer, CONFIG_AUDIO_SYNC_TIMER_LOG_LEVEL);
#define AUDIO_SYNC_HF_TIMER_CURR_TIME_CAPTURE_CHANNEL 1
#define AUDIO_SYNC_HF_TIMER_CURR_TIME_CAPTURE NRF_TIMER_TASK_CAPTURE1

static const nrfx_timer_t audio_sync_hf_timer_instance =
NRFX_TIMER_INSTANCE(AUDIO_SYNC_HF_TIMER_INSTANCE_NUMBER);
static nrfx_timer_t audio_sync_hf_timer_instance =
NRFX_TIMER_INSTANCE(NRF_TIMER_INST_GET(AUDIO_SYNC_HF_TIMER_INSTANCE_NUMBER));

static uint8_t dppi_channel_i2s_frame_start;

Expand Down
2 changes: 1 addition & 1 deletion applications/serial_lte_modem/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ CONFIG_GPIO_NRFX=y
CONFIG_SERIAL=y
CONFIG_UART_USE_RUNTIME_CONFIGURE=y
CONFIG_UART_ASYNC_API=y
CONFIG_NRFX_TIMER2=y
CONFIG_NRFX_TIMER=y

# Stacks and heaps
CONFIG_MAIN_STACK_SIZE=4096
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

CONFIG_NRFX_TIMER1=y
CONFIG_NRFX_TIMER=y
CONFIG_NRFX_RTC2=y
CONFIG_NRFX_PPI=y
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

CONFIG_NRFX_TIMER1=y
CONFIG_NRFX_TIMER=y
CONFIG_NRFX_RTC2=y
CONFIG_NRFX_PPI=y
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

CONFIG_NRFX_TIMER0=y
CONFIG_NRFX_TIMER=y
CONFIG_NRFX_RTC0=y
CONFIG_NRFX_GPPI=y
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

CONFIG_NRFX_TIMER0=y
CONFIG_NRFX_TIMER=y
CONFIG_NRFX_RTC0=y
CONFIG_NRFX_GPPI=y
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "conn_time_sync.h"

static const nrfx_rtc_t app_rtc_instance = NRFX_RTC_INSTANCE(2);
static const nrfx_timer_t app_timer_instance = NRFX_TIMER_INSTANCE(1);
static nrfx_timer_t app_timer_instance = NRFX_TIMER_INSTANCE(NRF_TIMER1);

static uint8_t ppi_chan_on_rtc_match;
static volatile uint32_t num_rtc_overflows;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "conn_time_sync.h"

static const nrfx_rtc_t app_rtc_instance = NRFX_RTC_INSTANCE(0);
static const nrfx_timer_t app_timer_instance = NRFX_TIMER_INSTANCE(0);
static nrfx_timer_t app_timer_instance = NRFX_TIMER_INSTANCE(NRF_TIMER0);

static uint8_t ppi_chan_on_rtc_match;
static volatile uint32_t num_rtc_overflows;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

# Disable the unsupported driver
CONFIG_NRFX_TIMER0=n
CONFIG_NRFX_TIMER2=n

# Use necessary peripherals
CONFIG_NRFX_TIMER020=y
CONFIG_NRFX_TIMER=y

CONFIG_MAIN_STACK_SIZE=2048
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,5 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

# Disable the unsupported driver
CONFIG_NRFX_TIMER0=n
CONFIG_NRFX_TIMER2=n

# Use necessary peripherals
CONFIG_NRFX_TIMER10=y
CONFIG_NRFX_TIMER=y
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,5 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

# Disable the unsupported driver
CONFIG_NRFX_TIMER0=n
CONFIG_NRFX_TIMER2=n

# Use necessary peripherals
CONFIG_NRFX_TIMER10=y
CONFIG_NRFX_TIMER=y
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,5 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

# Disable the unsupported driver
CONFIG_NRFX_TIMER0=n
CONFIG_NRFX_TIMER2=n

# Use necessary peripherals
CONFIG_NRFX_TIMER10=y
CONFIG_NRFX_TIMER=y
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,5 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

# Disable the unsupported driver
CONFIG_NRFX_TIMER0=n
CONFIG_NRFX_TIMER2=n

# Use necessary peripherals
CONFIG_NRFX_TIMER10=y
CONFIG_NRFX_TIMER=y
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,5 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

# Disable the unsupported driver
CONFIG_NRFX_TIMER0=n
CONFIG_NRFX_TIMER2=n

# Use necessary peripherals
CONFIG_NRFX_TIMER10=y
CONFIG_NRFX_TIMER=y
3 changes: 1 addition & 2 deletions samples/bluetooth/direct_test_mode/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ CONFIG_USE_SEGGER_RTT=y
CONFIG_LOG_BACKEND_RTT=y

# Use necessary peripherals
CONFIG_NRFX_TIMER0=y
CONFIG_NRFX_TIMER2=y
CONFIG_NRFX_TIMER=y
CONFIG_NRFX_GPPI=y
CONFIG_CLOCK_CONTROL=y

Expand Down
3 changes: 1 addition & 2 deletions samples/bluetooth/direct_test_mode/prj_hci.conf
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ CONFIG_USE_SEGGER_RTT=y
CONFIG_LOG_BACKEND_RTT=y

# Use necessary peripherals
CONFIG_NRFX_TIMER0=y
CONFIG_NRFX_TIMER2=y
CONFIG_NRFX_TIMER=y
CONFIG_NRFX_GPPI=y
CONFIG_CLOCK_CONTROL=y

Expand Down
3 changes: 1 addition & 2 deletions samples/bluetooth/direct_test_mode/prj_usb_5340.conf
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ CONFIG_USE_SEGGER_RTT=y
CONFIG_LOG_BACKEND_RTT=y

# Use necessary peripherals
CONFIG_NRFX_TIMER0=y
CONFIG_NRFX_TIMER2=y
CONFIG_NRFX_TIMER=y
CONFIG_NRFX_GPPI=y
CONFIG_CLOCK_CONTROL=y

Expand Down
6 changes: 1 addition & 5 deletions samples/bluetooth/direct_test_mode/prj_usb_54h20.conf
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,7 @@ CONFIG_UART_LINE_CTRL=y
CONFIG_DTM_USB=y
CONFIG_SERIAL=y

# Disable the unsupported driver
CONFIG_NRFX_TIMER0=n
CONFIG_NRFX_TIMER2=n

# Use necessary peripherals
CONFIG_NRFX_TIMER020=y
CONFIG_NRFX_TIMER=y
CONFIG_NRFX_GPPI=y
CONFIG_CLOCK_CONTROL=y
2 changes: 1 addition & 1 deletion samples/bluetooth/direct_test_mode/socs/nrf52840.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
#

# Use an additional timer for Anomaly 172
CONFIG_NRFX_TIMER3=y
CONFIG_NRFX_TIMER=y
30 changes: 7 additions & 23 deletions samples/bluetooth/direct_test_mode/src/dtm.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@
#define DEFAULT_TIMER_IRQ NRFX_CONCAT_3(TIMER, \
DEFAULT_TIMER_INSTANCE, \
_IRQn)
#define DEFAULT_TIMER_IRQ_HANDLER NRFX_CONCAT_3(nrfx_timer_, \
DEFAULT_TIMER_INSTANCE, \
_irq_handler)

/* Note that the timer instance 1 can be used in the communication module. */

Expand All @@ -83,19 +80,6 @@
#define ANOMALY_172_TIMER_IRQ NRFX_CONCAT_3(TIMER, \
ANOMALY_172_TIMER_INSTANCE, \
_IRQn)
#define ANOMALY_172_TIMER_IRQ_HANDLER NRFX_CONCAT_3(nrfx_timer_, \
ANOMALY_172_TIMER_INSTANCE, \
_irq_handler)
#endif /* NRF52_ERRATA_172_PRESENT */

/* Helper macro for labeling timer instances. */
#define NRFX_TIMER_CONFIG_LABEL(_num) NRFX_CONCAT_3(CONFIG_, NRFX_TIMER, _num)

BUILD_ASSERT(NRFX_TIMER_CONFIG_LABEL(DEFAULT_TIMER_INSTANCE) == 1,
"Core DTM timer needs additional KConfig configuration");
#if NRF52_ERRATA_172_PRESENT
BUILD_ASSERT(NRFX_TIMER_CONFIG_LABEL(ANOMALY_172_TIMER_INSTANCE) == 1,
"Anomaly DTM timer needs additional KConfig configuration");
#endif /* NRF52_ERRATA_172_PRESENT */

#define DTM_EGU_EVENT NRF_EGU_EVENT_TRIGGERED0
Expand Down Expand Up @@ -399,11 +383,11 @@ static struct dtm_instance {
uint32_t address;

/* Timer to be used for scheduling TX packets. */
const nrfx_timer_t timer;
nrfx_timer_t timer;

#if NRF52_ERRATA_172_PRESENT
/* Timer to be used to handle Anomaly 172. */
const nrfx_timer_t anomaly_timer;
nrfx_timer_t anomaly_timer;

/* Enable or disable the workaround for Errata 172. */
bool anomaly_172_wa_enabled;
Expand Down Expand Up @@ -435,9 +419,9 @@ static struct dtm_instance {
.state = STATE_UNINITIALIZED,
.packet_hdr_plen = NRF_RADIO_PREAMBLE_LENGTH_8BIT,
.address = DTM_RADIO_ADDRESS,
.timer = NRFX_TIMER_INSTANCE(DEFAULT_TIMER_INSTANCE),
.timer = NRFX_TIMER_INSTANCE(NRF_TIMER_INST_GET(DEFAULT_TIMER_INSTANCE)),
#if NRF52_ERRATA_172_PRESENT
.anomaly_timer = NRFX_TIMER_INSTANCE(ANOMALY_172_TIMER_INSTANCE),
.anomaly_timer = NRFX_TIMER_INSTANCE(NRF_TIMER_INST_GET(ANOMALY_172_TIMER_INSTANCE)),
#endif /* NRF52_ERRATA_172_PRESENT */
.radio_mode = NRF_RADIO_MODE_BLE_1MBIT,
.txpower = 0,
Expand Down Expand Up @@ -825,7 +809,7 @@ static int timer_init(void)
}

IRQ_CONNECT(DEFAULT_TIMER_IRQ, CONFIG_DTM_TIMER_IRQ_PRIORITY,
DEFAULT_TIMER_IRQ_HANDLER, NULL, 0);
nrfx_timer_irq_handler, &dtm_inst.timer, 0);

return 0;
}
Expand All @@ -849,8 +833,8 @@ static int anomaly_timer_init(void)

IRQ_CONNECT(ANOMALY_172_TIMER_IRQ,
CONFIG_ANOMALY_172_TIMER_IRQ_PRIORITY,
ANOMALY_172_TIMER_IRQ_HANDLER,
NULL, 0);
nrfx_timer_irq_handler,
&dtm_inst.anomaly_timer, 0);

nrfx_timer_compare(&dtm_inst.anomaly_timer,
NRF_TIMER_CC_CHANNEL0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

CONFIG_NRFX_TIMER1=y
CONFIG_NRFX_TIMER=y
CONFIG_NRFX_RTC2=y
CONFIG_NRFX_PPI=y
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

CONFIG_NRFX_TIMER1=y
CONFIG_NRFX_TIMER=y
CONFIG_NRFX_RTC2=y
CONFIG_NRFX_PPI=y
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

CONFIG_NRFX_TIMER0=y
CONFIG_NRFX_TIMER=y
CONFIG_NRFX_RTC0=y
CONFIG_NRFX_GPPI=y
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

CONFIG_NRFX_TIMER0=y
CONFIG_NRFX_TIMER=y
CONFIG_NRFX_RTC0=y
CONFIG_NRFX_GPPI=y
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "iso_time_sync.h"

static const nrfx_rtc_t app_rtc_instance = NRFX_RTC_INSTANCE(2);
static const nrfx_timer_t app_timer_instance = NRFX_TIMER_INSTANCE(1);
static nrfx_timer_t app_timer_instance = NRFX_TIMER_INSTANCE(NRF_TIMER1);

static uint8_t ppi_chan_on_rtc_match;
static volatile uint32_t num_rtc_overflows;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "iso_time_sync.h"

static const nrfx_rtc_t app_rtc_instance = NRFX_RTC_INSTANCE(0);
static const nrfx_timer_t app_timer_instance = NRFX_TIMER_INSTANCE(0);
static nrfx_timer_t app_timer_instance = NRFX_TIMER_INSTANCE(NRF_TIMER0);

static uint8_t ppi_chan_on_rtc_match;
static volatile uint32_t num_rtc_overflows;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ CONFIG_SHELL_PROMPT_UART=">"
# nrfx drivers configuration:
CONFIG_NRFX_POWER=y # enable DC/DC support
CONFIG_NRFX_RNG=y # enable RNG
CONFIG_NRFX_TIMER2=y # enable TIMER2
CONFIG_NRFX_TIMER=y # enable TIMER support

# Allow sharing the RTC between IEEE 802.15.4 and Zephyr
CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ CONFIG_SHELL_PROMPT_UART=">"
# nrfx drivers configuration:
CONFIG_NRFX_POWER=y # enable DC/DC support
CONFIG_NRFX_RNG=y # enable RNG
CONFIG_NRFX_TIMER2=y # enable TIMER2
CONFIG_NRFX_TIMER=y # enable TIMER support

# Allow sharing the RTC between IEEE 802.15.4 and Zephyr
CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ CONFIG_SHELL_PROMPT_UART=">"
# nrfx drivers configuration:
CONFIG_NRFX_POWER=y # enable DC/DC support
CONFIG_NRFX_RNG=y # enable RNG
CONFIG_NRFX_TIMER2=y # enable TIMER2
CONFIG_NRFX_TIMER=y # enable TIMER support

# Allow sharing the RTC between IEEE 802.15.4 and Zephyr
CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=2
# nrfx drivers configuration:
CONFIG_NRFX_POWER=y # enable DC/DC support
CONFIG_NRFX_RNG=y # enable RNG
CONFIG_NRFX_TIMER2=y # enable TIMER2
CONFIG_NRFX_TIMER=y # enable TIMER support

# Set temperature sensor update period in ms
CONFIG_NRF_802154_TEMPERATURE_UPDATE_PERIOD=10000
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ CONFIG_SHELL_PROMPT_UART=">"
CONFIG_PTT_CACHE_MGMT=n

# nrfx drivers configuration:
CONFIG_NRFX_TIMER20=y # enable TIMER2
CONFIG_NRFX_TIMER=y # enable TIMER support
# enable DPPIC
CONFIG_NRFX_GPPI=y

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ CONFIG_SHELL_PROMPT_UART=">"
# currently unsupported for nRF54LM20
CONFIG_PTT_CACHE_MGMT=n
# nrfx drivers configuration:
CONFIG_NRFX_TIMER20=y # enable TIMER2
CONFIG_NRFX_TIMER=y # enable TIMER support
# enable DPPIC
CONFIG_NRFX_GPPI=y

Expand Down
2 changes: 1 addition & 1 deletion samples/peripheral/802154_phy_test/src/periph_proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ LOG_MODULE_REGISTER(periph);
#define PTT_CLK_TIMER 20
#endif

static nrfx_timer_t clk_timer = NRFX_TIMER_INSTANCE(PTT_CLK_TIMER);
static nrfx_timer_t clk_timer = NRFX_TIMER_INSTANCE(NRF_TIMER_INST_GET(PTT_CLK_TIMER));

#define GPIOTE_NODE(gpio_node) DT_PHANDLE(gpio_node, gpiote_instance)
#define GPIOTE_INST_AND_COMMA(gpio_node) \
Expand Down
Loading
Loading