Skip to content

Commit bd24b31

Browse files
pizi-nordicgalak
authored andcommitted
Revert "soc: arm: nordic: provide custom busy_wait implementations"
This reverts commit d4b4b99 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 <[email protected]>
1 parent a449c98 commit bd24b31

File tree

4 files changed

+0
-23
lines changed

4 files changed

+0
-23
lines changed

soc/arm/nordic_nrf/nrf51/Kconfig.defconfig.series

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
2020
config SYS_POWER_MANAGEMENT
2121
default y
2222

23-
config ARCH_HAS_CUSTOM_BUSY_WAIT
24-
default y
25-
2623
config NUM_IRQS
2724
int
2825
default 26

soc/arm/nordic_nrf/nrf51/soc.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,4 @@ static int nordicsemi_nrf51_init(struct device *arg)
5959
return 0;
6060
}
6161

62-
#define DELAY_CALL_OVERHEAD_US 2
63-
64-
void z_arch_busy_wait(u32_t time_us)
65-
{
66-
if (time_us <= DELAY_CALL_OVERHEAD_US) {
67-
return;
68-
}
69-
70-
time_us -= DELAY_CALL_OVERHEAD_US;
71-
nrfx_coredep_delay_us(time_us);
72-
}
73-
7462
SYS_INIT(nordicsemi_nrf51_init, PRE_KERNEL_1, 0);

soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.series

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
1616
int
1717
default 32768
1818

19-
config ARCH_HAS_CUSTOM_BUSY_WAIT
20-
default y
21-
2219
config SYS_POWER_MANAGEMENT
2320
default y
2421

soc/arm/nordic_nrf/nrf52/soc.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,4 @@ static int nordicsemi_nrf52_init(struct device *arg)
8181
return 0;
8282
}
8383

84-
void z_arch_busy_wait(u32_t time_us)
85-
{
86-
nrfx_coredep_delay_us(time_us);
87-
}
88-
8984
SYS_INIT(nordicsemi_nrf52_init, PRE_KERNEL_1, 0);

0 commit comments

Comments
 (0)