From bd24b31139c1946bd9fe4c336c697b69608fac5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Zi=C4=99cik?= Date: Thu, 28 Mar 2019 16:56:52 +0100 Subject: [PATCH] Revert "soc: arm: nordic: provide custom busy_wait implementations" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d4b4b992725360a95ca1ffa357286be0b16615e5 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 --- soc/arm/nordic_nrf/nrf51/Kconfig.defconfig.series | 3 --- soc/arm/nordic_nrf/nrf51/soc.c | 12 ------------ soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.series | 3 --- soc/arm/nordic_nrf/nrf52/soc.c | 5 ----- 4 files changed, 23 deletions(-) diff --git a/soc/arm/nordic_nrf/nrf51/Kconfig.defconfig.series b/soc/arm/nordic_nrf/nrf51/Kconfig.defconfig.series index ee4873c2c49..48a67407e70 100644 --- a/soc/arm/nordic_nrf/nrf51/Kconfig.defconfig.series +++ b/soc/arm/nordic_nrf/nrf51/Kconfig.defconfig.series @@ -20,9 +20,6 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC config SYS_POWER_MANAGEMENT default y -config ARCH_HAS_CUSTOM_BUSY_WAIT - default y - config NUM_IRQS int default 26 diff --git a/soc/arm/nordic_nrf/nrf51/soc.c b/soc/arm/nordic_nrf/nrf51/soc.c index cb3021a748a..eb235d1cf64 100644 --- a/soc/arm/nordic_nrf/nrf51/soc.c +++ b/soc/arm/nordic_nrf/nrf51/soc.c @@ -59,16 +59,4 @@ static int nordicsemi_nrf51_init(struct device *arg) 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); diff --git a/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.series b/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.series index 380387c1666..39349577163 100644 --- a/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.series +++ b/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.series @@ -16,9 +16,6 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC int default 32768 -config ARCH_HAS_CUSTOM_BUSY_WAIT - default y - config SYS_POWER_MANAGEMENT default y diff --git a/soc/arm/nordic_nrf/nrf52/soc.c b/soc/arm/nordic_nrf/nrf52/soc.c index 106a91ab8f5..1209405e73f 100644 --- a/soc/arm/nordic_nrf/nrf52/soc.c +++ b/soc/arm/nordic_nrf/nrf52/soc.c @@ -81,9 +81,4 @@ static int nordicsemi_nrf52_init(struct device *arg) 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);