michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: clock control: nrf: rename CLOCK_CONTROL_NRF5 Kconfig symbol

Browse source 
This commit renames the CLOCK_CONTROL_NRF5 Kconfig symbol to
CLOCK_CONTROL_NRF. The change is required to aleviates confusion
when selecting the symbol in nRF9160 SOC definition.

Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
This commit is contained in:
Ioannis Glaropoulos 2019-01-15 09:49:17 +01:00 • committed by Carles Cufí
commit 302a746bd6
17 changed files with 74 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

4
boards/arm/bbc_microbit/bbc_microbit_defconfig
View file

@ -5,8 +5,8 @@ CONFIG_SOC_NRF51822_QFAA=y
CONFIG_BOARD_BBC_MICROBIT=y CONFIG_BOARD_BBC_MICROBIT=y
# clock control # clock control
CONFIG_CLOCK_CONTROL_NRF5_K32SRC_RC=y CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
CONFIG_CLOCK_CONTROL_NRF5_K32SRC_250PPM=y CONFIG_CLOCK_CONTROL_NRF_K32SRC_250PPM=y
# enable uart driver # enable uart driver
CONFIG_SERIAL=y CONFIG_SERIAL=y

2
boards/posix/nrf52_bsim/Kconfig.board
View file

@ -9,7 +9,7 @@ config BOARD_NRF52_BSIM
select CONSOLE_HAS_DRIVER select CONSOLE_HAS_DRIVER
select NRF_RTC_TIMER select NRF_RTC_TIMER
select CLOCK_CONTROL select CLOCK_CONTROL
select CLOCK_CONTROL_NRF5 select CLOCK_CONTROL_NRF
help help
Will produce a console Linux process which can be executed natively. Will produce a console Linux process which can be executed natively.
It needs the BabbleSim simulator both in compile time and to execute It needs the BabbleSim simulator both in compile time and to execute

2
drivers/clock_control/CMakeLists.txt
View file

@ -1,7 +1,7 @@
zephyr_sources_ifdef(CONFIG_CLOCK_CONTROL_BEETLE beetle_clock_control.c) zephyr_sources_ifdef(CONFIG_CLOCK_CONTROL_BEETLE beetle_clock_control.c)
zephyr_sources_ifdef(CONFIG_CLOCK_CONTROL_MCUX_CCM clock_control_mcux_ccm.c) zephyr_sources_ifdef(CONFIG_CLOCK_CONTROL_MCUX_CCM clock_control_mcux_ccm.c)
zephyr_sources_ifdef(CONFIG_CLOCK_CONTROL_MCUX_SIM clock_control_mcux_sim.c) zephyr_sources_ifdef(CONFIG_CLOCK_CONTROL_MCUX_SIM clock_control_mcux_sim.c)
zephyr_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF5 nrf5_power_clock.c) zephyr_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF nrf5_power_clock.c)
zephyr_sources_ifdef(CONFIG_CLOCK_CONTROL_QUARK_SE quark_se_clock_control.c) zephyr_sources_ifdef(CONFIG_CLOCK_CONTROL_QUARK_SE quark_se_clock_control.c)
if(CONFIG_CLOCK_CONTROL_STM32_CUBE) if(CONFIG_CLOCK_CONTROL_STM32_CUBE)

50
drivers/clock_control/Kconfig.nrf5
View file

@ -4,45 +4,45 @@
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
menuconfig CLOCK_CONTROL_NRF5 menuconfig CLOCK_CONTROL_NRF
bool "NRF5 Clock controller support" bool "NRF Clock controller support"
depends on SOC_COMPATIBLE_NRF depends on SOC_COMPATIBLE_NRF
help help
Enable support for the Nordic Semiconductor nRF5x series SoC clock Enable support for the Nordic Semiconductor nRFxx series SoC clock
driver. driver.
if CLOCK_CONTROL_NRF5 if CLOCK_CONTROL_NRF
config CLOCK_CONTROL_NRF5_IRQ_PRIORITY config CLOCK_CONTROL_NRF_IRQ_PRIORITY
int "Power Clock Interrupt Priority" int "Power Clock Interrupt Priority"
range 0 7 range 0 7
default 1 default 1
help help
The interrupt priority for Power Clock interrupt. The interrupt priority for Power Clock interrupt.
config CLOCK_CONTROL_NRF5_M16SRC_DRV_NAME config CLOCK_CONTROL_NRF_M16SRC_DRV_NAME
string "NRF5 16MHz clock device name" string "NRFx 16MHz clock device name"
default "clk_m16src" default "clk_m16src"
config CLOCK_CONTROL_NRF5_K32SRC_DRV_NAME config CLOCK_CONTROL_NRF_K32SRC_DRV_NAME
string "NRF5 32KHz clock device name" string "NRFx 32KHz clock device name"
default "clk_k32src" default "clk_k32src"
choice choice
prompt "32KHz clock source" prompt "32KHz clock source"
default CLOCK_CONTROL_NRF5_K32SRC_XTAL default CLOCK_CONTROL_NRF_K32SRC_XTAL
config CLOCK_CONTROL_NRF5_K32SRC_RC config CLOCK_CONTROL_NRF_K32SRC_RC
bool "RC Oscillator" bool "RC Oscillator"
config CLOCK_CONTROL_NRF5_K32SRC_XTAL config CLOCK_CONTROL_NRF_K32SRC_XTAL
bool "Crystal Oscillator" bool "Crystal Oscillator"
endchoice endchoice
config CLOCK_CONTROL_NRF5_K32SRC_BLOCKING config CLOCK_CONTROL_NRF_K32SRC_BLOCKING
bool "Blocking 32KHz crystal oscillator startup" bool "Blocking 32KHz crystal oscillator startup"
depends on CLOCK_CONTROL_NRF5_K32SRC_XTAL depends on CLOCK_CONTROL_NRF_K32SRC_XTAL
help help
Clock control driver will spin wait in CPU sleep until 32KHz Clock control driver will spin wait in CPU sleep until 32KHz
crystal oscillator starts up. If not enabled, RC oscillator will crystal oscillator starts up. If not enabled, RC oscillator will
@ -51,33 +51,33 @@ config CLOCK_CONTROL_NRF5_K32SRC_BLOCKING
choice choice
prompt "32KHz clock accuracy" prompt "32KHz clock accuracy"
default CLOCK_CONTROL_NRF5_K32SRC_500PPM if CLOCK_CONTROL_NRF5_K32SRC_RC default CLOCK_CONTROL_NRF_K32SRC_500PPM if CLOCK_CONTROL_NRF_K32SRC_RC
default CLOCK_CONTROL_NRF5_K32SRC_20PPM default CLOCK_CONTROL_NRF_K32SRC_20PPM
config CLOCK_CONTROL_NRF5_K32SRC_500PPM config CLOCK_CONTROL_NRF_K32SRC_500PPM
bool "251 ppm to 500 ppm" bool "251 ppm to 500 ppm"
config CLOCK_CONTROL_NRF5_K32SRC_250PPM config CLOCK_CONTROL_NRF_K32SRC_250PPM
bool "151 ppm to 250 ppm" bool "151 ppm to 250 ppm"
config CLOCK_CONTROL_NRF5_K32SRC_150PPM config CLOCK_CONTROL_NRF_K32SRC_150PPM
bool "101 ppm to 150 ppm" bool "101 ppm to 150 ppm"
config CLOCK_CONTROL_NRF5_K32SRC_100PPM config CLOCK_CONTROL_NRF_K32SRC_100PPM
bool "76 ppm to 100 ppm" bool "76 ppm to 100 ppm"
config CLOCK_CONTROL_NRF5_K32SRC_75PPM config CLOCK_CONTROL_NRF_K32SRC_75PPM
bool "51 ppm to 75 ppm" bool "51 ppm to 75 ppm"
config CLOCK_CONTROL_NRF5_K32SRC_50PPM config CLOCK_CONTROL_NRF_K32SRC_50PPM
bool "31 ppm to 50 ppm" bool "31 ppm to 50 ppm"
config CLOCK_CONTROL_NRF5_K32SRC_30PPM config CLOCK_CONTROL_NRF_K32SRC_30PPM
bool "21 ppm to 30 ppm" bool "21 ppm to 30 ppm"
config CLOCK_CONTROL_NRF5_K32SRC_20PPM config CLOCK_CONTROL_NRF_K32SRC_20PPM
bool "0 ppm to 20 ppm" bool "0 ppm to 20 ppm"
endchoice endchoice
endif # CLOCK_CONTROL_NRF5 endif # CLOCK_CONTROL_NRF

16
drivers/clock_control/nrf5_power_clock.c
View file

@ -150,9 +150,9 @@ static int _k32src_start(struct device *dev, clock_control_subsys_t sub_system)
u32_t imask; u32_t imask;
u32_t stat; u32_t stat;
#if defined(CONFIG_CLOCK_CONTROL_NRF5_K32SRC_BLOCKING) #if defined(CONFIG_CLOCK_CONTROL_NRF_K32SRC_BLOCKING)
u32_t intenset; u32_t intenset;
#endif /* CONFIG_CLOCK_CONTROL_NRF5_K32SRC_BLOCKING */ #endif /* CONFIG_CLOCK_CONTROL_NRF_K32SRC_BLOCKING */
/* If the LF clock is already started, but wasn't initialized with /* If the LF clock is already started, but wasn't initialized with
* this function, allow it to run once. This is needed because if a * this function, allow it to run once. This is needed because if a
@ -183,7 +183,7 @@ static int _k32src_start(struct device *dev, clock_control_subsys_t sub_system)
lf_clk_src = POINTER_TO_UINT(sub_system); lf_clk_src = POINTER_TO_UINT(sub_system);
NRF_CLOCK->LFCLKSRC = lf_clk_src; NRF_CLOCK->LFCLKSRC = lf_clk_src;
#if defined(CONFIG_CLOCK_CONTROL_NRF5_K32SRC_BLOCKING) #if defined(CONFIG_CLOCK_CONTROL_NRF_K32SRC_BLOCKING)
irq_disable(POWER_CLOCK_IRQn); irq_disable(POWER_CLOCK_IRQn);
intenset = NRF_CLOCK->INTENSET; intenset = NRF_CLOCK->INTENSET;
@ -208,13 +208,13 @@ static int _k32src_start(struct device *dev, clock_control_subsys_t sub_system)
irq_enable(POWER_CLOCK_IRQn); irq_enable(POWER_CLOCK_IRQn);
#else /* !CONFIG_CLOCK_CONTROL_NRF5_K32SRC_BLOCKING */ #else /* !CONFIG_CLOCK_CONTROL_NRF_K32SRC_BLOCKING */
/* NOTE: LFCLK will initially start running from the LFRC if LFXO is /* NOTE: LFCLK will initially start running from the LFRC if LFXO is
* selected. * selected.
*/ */
nrf_clock_int_enable(NRF_CLOCK_INT_LF_STARTED_MASK); nrf_clock_int_enable(NRF_CLOCK_INT_LF_STARTED_MASK);
nrf_clock_task_trigger(NRF_CLOCK_TASK_LFCLKSTART); nrf_clock_task_trigger(NRF_CLOCK_TASK_LFCLKSTART);
#endif /* !CONFIG_CLOCK_CONTROL_NRF5_K32SRC_BLOCKING */ #endif /* !CONFIG_CLOCK_CONTROL_NRF_K32SRC_BLOCKING */
/* If RC selected, calibrate and start timer for consecutive /* If RC selected, calibrate and start timer for consecutive
* calibrations. * calibrations.
@ -420,7 +420,7 @@ static int _clock_control_init(struct device *dev)
* NOTE: Currently the operations here are idempotent. * NOTE: Currently the operations here are idempotent.
*/ */
IRQ_CONNECT(NRF5_IRQ_POWER_CLOCK_IRQn, IRQ_CONNECT(NRF5_IRQ_POWER_CLOCK_IRQn,
CONFIG_CLOCK_CONTROL_NRF5_IRQ_PRIORITY, CONFIG_CLOCK_CONTROL_NRF_IRQ_PRIORITY,
_power_clock_isr, 0, 0); _power_clock_isr, 0, 0);
irq_enable(POWER_CLOCK_IRQn); irq_enable(POWER_CLOCK_IRQn);
@ -435,7 +435,7 @@ static const struct clock_control_driver_api _m16src_clock_control_api = {
}; };
DEVICE_AND_API_INIT(clock_nrf5_m16src, DEVICE_AND_API_INIT(clock_nrf5_m16src,
CONFIG_CLOCK_CONTROL_NRF5_M16SRC_DRV_NAME, CONFIG_CLOCK_CONTROL_NRF_M16SRC_DRV_NAME,
_clock_control_init, NULL, NULL, PRE_KERNEL_1, _clock_control_init, NULL, NULL, PRE_KERNEL_1,
CONFIG_KERNEL_INIT_PRIORITY_DEVICE, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&_m16src_clock_control_api); &_m16src_clock_control_api);
@ -447,7 +447,7 @@ static const struct clock_control_driver_api _k32src_clock_control_api = {
}; };
DEVICE_AND_API_INIT(clock_nrf5_k32src, DEVICE_AND_API_INIT(clock_nrf5_k32src,
CONFIG_CLOCK_CONTROL_NRF5_K32SRC_DRV_NAME, CONFIG_CLOCK_CONTROL_NRF_K32SRC_DRV_NAME,
_clock_control_init, NULL, NULL, PRE_KERNEL_1, _clock_control_init, NULL, NULL, PRE_KERNEL_1,
CONFIG_KERNEL_INIT_PRIORITY_DEVICE, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&_k32src_clock_control_api); &_k32src_clock_control_api);

2
drivers/ieee802154/ieee802154_nrf5.c
View file

@ -354,7 +354,7 @@ static int nrf5_init(struct device *dev)
k_sem_init(&nrf5_radio->tx_wait, 0, 1); k_sem_init(&nrf5_radio->tx_wait, 0, 1);
k_sem_init(&nrf5_radio->cca_wait, 0, 1); k_sem_init(&nrf5_radio->cca_wait, 0, 1);
clk_m16 = device_get_binding(CONFIG_CLOCK_CONTROL_NRF5_M16SRC_DRV_NAME); clk_m16 = device_get_binding(CONFIG_CLOCK_CONTROL_NRF_M16SRC_DRV_NAME);
if (!clk_m16) { if (!clk_m16) {
return -ENODEV; return -ENODEV;
} }

2
drivers/led_strip/ws2812b_sw.c
View file

@ -32,7 +32,7 @@ static int send_buf(u8_t *buf, size_t len)
*/ */
u32_t i = 0U; u32_t i = 0U;
clock = device_get_binding(CONFIG_CLOCK_CONTROL_NRF5_M16SRC_DRV_NAME); clock = device_get_binding(CONFIG_CLOCK_CONTROL_NRF_M16SRC_DRV_NAME);
if (!clock) { if (!clock) {
LOG_ERR("Unable to get HF clock"); LOG_ERR("Unable to get HF clock");
return -EIO; return -EIO;

2
drivers/sensor/nrf5/temp_nrf5.c
View file

@ -112,7 +112,7 @@ static int temp_nrf5_init(struct device *dev)
LOG_DBG(""); LOG_DBG("");
data->clk_m16_dev = data->clk_m16_dev =
device_get_binding(CONFIG_CLOCK_CONTROL_NRF5_M16SRC_DRV_NAME); device_get_binding(CONFIG_CLOCK_CONTROL_NRF_M16SRC_DRV_NAME);
__ASSERT_NO_MSG(data->clk_m16_dev); __ASSERT_NO_MSG(data->clk_m16_dev);
k_sem_init(&data->device_sync_sem, 0, UINT_MAX); k_sem_init(&data->device_sync_sem, 0, UINT_MAX);

2
drivers/timer/Kconfig
View file

@ -152,7 +152,7 @@ config ALTERA_AVALON_TIMER
config NRF_RTC_TIMER config NRF_RTC_TIMER
bool "nRF Real Time Counter (NRF_RTC1) Timer" bool "nRF Real Time Counter (NRF_RTC1) Timer"
default y default y
depends on CLOCK_CONTROL_NRF5 depends on CLOCK_CONTROL_NRF
select TICKLESS_CAPABLE select TICKLESS_CAPABLE
help help
This module implements a kernel device driver for the nRF Real Time This module implements a kernel device driver for the nRF Real Time

4
drivers/timer/nrf_rtc_timer.c
View file

@ -79,12 +79,12 @@ int z_clock_driver_init(struct device *device)
ARG_UNUSED(device); ARG_UNUSED(device);
clock = device_get_binding(CONFIG_CLOCK_CONTROL_NRF5_K32SRC_DRV_NAME); clock = device_get_binding(CONFIG_CLOCK_CONTROL_NRF_K32SRC_DRV_NAME);
if (!clock) { if (!clock) {
return -1; return -1;
} }
clock_control_on(clock, (void *)CLOCK_CONTROL_NRF5_K32SRC); clock_control_on(clock, (void *)CLOCK_CONTROL_NRF_K32SRC);
/* TODO: replace with counter driver to access RTC */ /* TODO: replace with counter driver to access RTC */
nrf_rtc_prescaler_set(RTC, 0); nrf_rtc_prescaler_set(RTC, 0);

2
drivers/usb/device/usb_dc_nrfx.c
View file

@ -479,7 +479,7 @@ static int hf_clock_enable(bool on, bool blocking)
int ret = -ENODEV; int ret = -ENODEV;
struct device *clock; struct device *clock;
clock = device_get_binding(CONFIG_CLOCK_CONTROL_NRF5_M16SRC_DRV_NAME); clock = device_get_binding(CONFIG_CLOCK_CONTROL_NRF_M16SRC_DRV_NAME);
if (!clock) { if (!clock) {
LOG_ERR("NRF HF Clock device not found!"); LOG_ERR("NRF HF Clock device not found!");
return ret; return ret;

40
include/drivers/clock_control/nrf5_clock_control.h
View file

@ -14,37 +14,37 @@
/* TODO: move all these to clock_control.h ? */ /* TODO: move all these to clock_control.h ? */
/* Define 32KHz clock source */ /* Define 32KHz clock source */
#ifdef CONFIG_CLOCK_CONTROL_NRF5_K32SRC_RC #ifdef CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC
#define CLOCK_CONTROL_NRF5_K32SRC 0 #define CLOCK_CONTROL_NRF_K32SRC 0
#endif #endif
#ifdef CONFIG_CLOCK_CONTROL_NRF5_K32SRC_XTAL #ifdef CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL
#define CLOCK_CONTROL_NRF5_K32SRC 1 #define CLOCK_CONTROL_NRF_K32SRC 1
#endif #endif
/* Define 32KHz clock accuracy */ /* Define 32KHz clock accuracy */
#ifdef CONFIG_CLOCK_CONTROL_NRF5_K32SRC_500PPM #ifdef CONFIG_CLOCK_CONTROL_NRF_K32SRC_500PPM
#define CLOCK_CONTROL_NRF5_K32SRC_ACCURACY 0 #define CLOCK_CONTROL_NRF_K32SRC_ACCURACY 0
#endif #endif
#ifdef CONFIG_CLOCK_CONTROL_NRF5_K32SRC_250PPM #ifdef CONFIG_CLOCK_CONTROL_NRF_K32SRC_250PPM
#define CLOCK_CONTROL_NRF5_K32SRC_ACCURACY 1 #define CLOCK_CONTROL_NRF_K32SRC_ACCURACY 1
#endif #endif
#ifdef CONFIG_CLOCK_CONTROL_NRF5_K32SRC_150PPM #ifdef CONFIG_CLOCK_CONTROL_NRF_K32SRC_150PPM
#define CLOCK_CONTROL_NRF5_K32SRC_ACCURACY 2 #define CLOCK_CONTROL_NRF_K32SRC_ACCURACY 2
#endif #endif
#ifdef CONFIG_CLOCK_CONTROL_NRF5_K32SRC_100PPM #ifdef CONFIG_CLOCK_CONTROL_NRF_K32SRC_100PPM
#define CLOCK_CONTROL_NRF5_K32SRC_ACCURACY 3 #define CLOCK_CONTROL_NRF_K32SRC_ACCURACY 3
#endif #endif
#ifdef CONFIG_CLOCK_CONTROL_NRF5_K32SRC_75PPM #ifdef CONFIG_CLOCK_CONTROL_NRF_K32SRC_75PPM
#define CLOCK_CONTROL_NRF5_K32SRC_ACCURACY 4 #define CLOCK_CONTROL_NRF_K32SRC_ACCURACY 4
#endif #endif
#ifdef CONFIG_CLOCK_CONTROL_NRF5_K32SRC_50PPM #ifdef CONFIG_CLOCK_CONTROL_NRF_K32SRC_50PPM
#define CLOCK_CONTROL_NRF5_K32SRC_ACCURACY 5 #define CLOCK_CONTROL_NRF_K32SRC_ACCURACY 5
#endif #endif
#ifdef CONFIG_CLOCK_CONTROL_NRF5_K32SRC_30PPM #ifdef CONFIG_CLOCK_CONTROL_NRF_K32SRC_30PPM
#define CLOCK_CONTROL_NRF5_K32SRC_ACCURACY 6 #define CLOCK_CONTROL_NRF_K32SRC_ACCURACY 6
#endif #endif
#ifdef CONFIG_CLOCK_CONTROL_NRF5_K32SRC_20PPM #ifdef CONFIG_CLOCK_CONTROL_NRF_K32SRC_20PPM
#define CLOCK_CONTROL_NRF5_K32SRC_ACCURACY 7 #define CLOCK_CONTROL_NRF_K32SRC_ACCURACY 7
#endif #endif
#if defined(CONFIG_USB) && defined(CONFIG_SOC_NRF52840) #if defined(CONFIG_USB) && defined(CONFIG_SOC_NRF52840)

2
soc/arm/nordic_nrf/nrf51/Kconfig.series
View file

@ -12,7 +12,7 @@ config SOC_SERIES_NRF51X
select SOC_FAMILY_NRF select SOC_FAMILY_NRF
select NRF_RTC_TIMER select NRF_RTC_TIMER
select CLOCK_CONTROL select CLOCK_CONTROL
select CLOCK_CONTROL_NRF5 select CLOCK_CONTROL_NRF
select SYS_POWER_LOW_POWER_STATE_SUPPORTED select SYS_POWER_LOW_POWER_STATE_SUPPORTED
select XIP select XIP
select HAS_CMSIS select HAS_CMSIS

2
soc/arm/nordic_nrf/nrf52/Kconfig.series
View file

@ -13,7 +13,7 @@ config SOC_SERIES_NRF52X
select SOC_FAMILY_NRF select SOC_FAMILY_NRF
select NRF_RTC_TIMER select NRF_RTC_TIMER
select CLOCK_CONTROL select CLOCK_CONTROL
select CLOCK_CONTROL_NRF5 select CLOCK_CONTROL_NRF
select SYS_POWER_LOW_POWER_STATE_SUPPORTED select SYS_POWER_LOW_POWER_STATE_SUPPORTED
select SYS_POWER_STATE_CPU_LPS_SUPPORTED select SYS_POWER_STATE_CPU_LPS_SUPPORTED
select SYS_POWER_STATE_CPU_LPS_1_SUPPORTED select SYS_POWER_STATE_CPU_LPS_1_SUPPORTED

2
subsys/bluetooth/controller/hci/hci_driver.c
View file

@ -24,7 +24,7 @@
#include <bluetooth/hci.h> #include <bluetooth/hci.h>
#include <drivers/bluetooth/hci_driver.h> #include <drivers/bluetooth/hci_driver.h>
#ifdef CONFIG_CLOCK_CONTROL_NRF5 #ifdef CONFIG_CLOCK_CONTROL_NRF
#include <drivers/clock_control/nrf5_clock_control.h> #include <drivers/clock_control/nrf5_clock_control.h>
#endif #endif

4
subsys/bluetooth/controller/ll_sw/ctrl.c
View file

@ -4753,11 +4753,11 @@ static void k32src_wait(void)
done = true; done = true;
struct device *lf_clock = device_get_binding( struct device *lf_clock = device_get_binding(
CONFIG_CLOCK_CONTROL_NRF5_K32SRC_DRV_NAME); CONFIG_CLOCK_CONTROL_NRF_K32SRC_DRV_NAME);
LL_ASSERT(lf_clock); LL_ASSERT(lf_clock);
while (clock_control_on(lf_clock, (void *)CLOCK_CONTROL_NRF5_K32SRC)) { while (clock_control_on(lf_clock, (void *)CLOCK_CONTROL_NRF_K32SRC)) {
DEBUG_CPU_SLEEP(1); DEBUG_CPU_SLEEP(1);
cpu_sleep(); cpu_sleep();
DEBUG_CPU_SLEEP(0); DEBUG_CPU_SLEEP(0);

10
subsys/bluetooth/controller/ll_sw/ll.c
View file

@ -11,7 +11,7 @@
#include <soc.h> #include <soc.h>
#include <device.h> #include <device.h>
#include <clock_control.h> #include <clock_control.h>
#ifdef CONFIG_CLOCK_CONTROL_NRF5 #ifdef CONFIG_CLOCK_CONTROL_NRF
#include <drivers/clock_control/nrf5_clock_control.h> #include <drivers/clock_control/nrf5_clock_control.h>
#endif #endif
#include <bluetooth/hci.h> #include <bluetooth/hci.h>
@ -127,12 +127,12 @@ int ll_init(struct k_sem *sem_rx)
sem_recv = sem_rx; sem_recv = sem_rx;
clk_k32 = device_get_binding(CONFIG_CLOCK_CONTROL_NRF5_K32SRC_DRV_NAME); clk_k32 = device_get_binding(CONFIG_CLOCK_CONTROL_NRF_K32SRC_DRV_NAME);
if (!clk_k32) { if (!clk_k32) {
return -ENODEV; return -ENODEV;
} }
clock_control_on(clk_k32, (void *)CLOCK_CONTROL_NRF5_K32SRC); clock_control_on(clk_k32, (void *)CLOCK_CONTROL_NRF_K32SRC);
entropy = device_get_binding(CONFIG_ENTROPY_NAME); entropy = device_get_binding(CONFIG_ENTROPY_NAME);
if (!entropy) { if (!entropy) {
@ -158,12 +158,12 @@ int ll_init(struct k_sem *sem_rx)
hal_ticker_instance0_trigger_set); hal_ticker_instance0_trigger_set);
LL_ASSERT(!err); LL_ASSERT(!err);
clk_m16 = device_get_binding(CONFIG_CLOCK_CONTROL_NRF5_M16SRC_DRV_NAME); clk_m16 = device_get_binding(CONFIG_CLOCK_CONTROL_NRF_M16SRC_DRV_NAME);
if (!clk_m16) { if (!clk_m16) {
return -ENODEV; return -ENODEV;
} }
err = radio_init(clk_m16, CLOCK_CONTROL_NRF5_K32SRC_ACCURACY, entropy, err = radio_init(clk_m16, CLOCK_CONTROL_NRF_K32SRC_ACCURACY, entropy,
RADIO_CONNECTION_CONTEXT_MAX, RADIO_CONNECTION_CONTEXT_MAX,
RADIO_PACKET_COUNT_RX_MAX, RADIO_PACKET_COUNT_RX_MAX,
RADIO_PACKET_COUNT_TX_MAX, RADIO_PACKET_COUNT_TX_MAX,