michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Revert "soc: arm: nordic: provide custom busy_wait implementations"

Browse source 
This reverts commit d4b4b99272 as it
introduced unwanted side effect: It moved the k_busy_wait() to other
clock that the one driving system timer and k_cycle_get_32(). As result,
delays created using these interfaces not matched each other.

Signed-off-by: Piotr Zięcik <piotr.ziecik@nordicsemi.no>
This commit is contained in:
Piotr Zięcik 2019-03-28 16:56:52 +01:00 • committed by Kumar Gala
commit bd24b31139
4 changed files with 0 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
soc/arm/nordic_nrf/nrf51/Kconfig.defconfig.series
View file

@ -20,9 +20,6 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
config SYS_POWER_MANAGEMENT config SYS_POWER_MANAGEMENT
default y default y
config ARCH_HAS_CUSTOM_BUSY_WAIT
default y
config NUM_IRQS config NUM_IRQS
int int
default 26 default 26

12
soc/arm/nordic_nrf/nrf51/soc.c
View file

@ -59,16 +59,4 @@ static int nordicsemi_nrf51_init(struct device *arg)
return 0; return 0;
} }
#define DELAY_CALL_OVERHEAD_US 2
void z_arch_busy_wait(u32_t time_us)
{
if (time_us <= DELAY_CALL_OVERHEAD_US) {
return;
}
time_us -= DELAY_CALL_OVERHEAD_US;
nrfx_coredep_delay_us(time_us);
}
SYS_INIT(nordicsemi_nrf51_init, PRE_KERNEL_1, 0); SYS_INIT(nordicsemi_nrf51_init, PRE_KERNEL_1, 0);

3
soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.series
View file

@ -16,9 +16,6 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
int int
default 32768 default 32768
config ARCH_HAS_CUSTOM_BUSY_WAIT
default y
config SYS_POWER_MANAGEMENT config SYS_POWER_MANAGEMENT
default y default y

5
soc/arm/nordic_nrf/nrf52/soc.c
View file

@ -81,9 +81,4 @@ static int nordicsemi_nrf52_init(struct device *arg)
return 0; return 0;
} }
void z_arch_busy_wait(u32_t time_us)
{
nrfx_coredep_delay_us(time_us);
}
SYS_INIT(nordicsemi_nrf52_init, PRE_KERNEL_1, 0); SYS_INIT(nordicsemi_nrf52_init, PRE_KERNEL_1, 0);