From 535a3dbb18fea8bf162bff959072cdff145ea10e Mon Sep 17 00:00:00 2001 From: raiden00pl Date: Thu, 25 Jan 2024 17:50:53 +0100 Subject: [PATCH] boards/{nrf52840-dk| nrf52840-dk}: use TIMER1 as hardware timer TIMER0 is reserved for SoftDevice and will be reserved for IEEE 802.15.4 so it's better to use another timer by default --- boards/arm/nrf52/nrf52832-dk/configs/timer/defconfig | 2 +- boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c | 2 +- boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig | 2 +- boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boards/arm/nrf52/nrf52832-dk/configs/timer/defconfig b/boards/arm/nrf52/nrf52832-dk/configs/timer/defconfig index 1592712d7d..2aeb152a31 100644 --- a/boards/arm/nrf52/nrf52832-dk/configs/timer/defconfig +++ b/boards/arm/nrf52/nrf52832-dk/configs/timer/defconfig @@ -25,7 +25,7 @@ CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_MM_REGIONS=2 -CONFIG_NRF52_TIMER0=y +CONFIG_NRF52_TIMER1=y CONFIG_NRF52_UART0=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y diff --git a/boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c b/boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c index 026711c204..3526a9f930 100644 --- a/boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c +++ b/boards/arm/nrf52/nrf52832-dk/src/nrf52_bringup.c @@ -59,7 +59,7 @@ * Pre-processor Definitions ****************************************************************************/ -#define NRF52_TIMER (0) +#define NRF52_TIMER (1) /**************************************************************************** * Public Functions diff --git a/boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig b/boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig index f65bb14ed8..3775f72f20 100644 --- a/boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig +++ b/boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig @@ -26,7 +26,7 @@ CONFIG_FS_FAT=y CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_MM_REGIONS=2 CONFIG_NRF52_RTC0=y -CONFIG_NRF52_TIMER0=y +CONFIG_NRF52_TIMER1=y CONFIG_NRF52_UART0=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y diff --git a/boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c b/boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c index f59b7b7a97..4bc740ff01 100644 --- a/boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c +++ b/boards/arm/nrf52/nrf52840-dk/src/nrf52_bringup.c @@ -67,7 +67,7 @@ * Pre-processor Definitions ****************************************************************************/ -#define NRF52_TIMER (0) +#define NRF52_TIMER (1) #define LMS9DS1_I2CBUS (0) /****************************************************************************