michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: clock control: rename nrf5_power_clock source and header

Browse source 
This commit renames the nrf5_clock_control.h and
nrf5_clock_control.c files to nrf_clock_control.h and
nrf_clock_control.c, respectively, as they are used
in nRF9160 builds, as well.

Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
This commit is contained in:
Ioannis Glaropoulos 2019-01-15 10:27:20 +01:00 • committed by Carles Cufí
commit 2e687653fa
9 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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_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_NRF nrf5_power_clock.c)
zephyr_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF nrf_power_clock.c)
zephyr_sources_ifdef(CONFIG_CLOCK_CONTROL_QUARK_SE quark_se_clock_control.c)
if(CONFIG_CLOCK_CONTROL_STM32_CUBE)

2
drivers/clock_control/nrf5_power_clock.c → drivers/clock_control/nrf_power_clock.c
View file

@ -14,7 +14,7 @@
#include "nrf_clock.h"
#if defined(CONFIG_USB) && defined(CONFIG_SOC_NRF52840)
#include <nrf_power.h>
#include <drivers/clock_control/nrf5_clock_control.h>
#include <drivers/clock_control/nrf_clock_control.h>
#endif
static u8_t m16src_ref;

2
drivers/ieee802154/ieee802154_nrf5.c
View file

@ -32,7 +32,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
#include <random/rand32.h>
#include <net/ieee802154_radio.h>
#include <drivers/clock_control/nrf5_clock_control.h>
#include <drivers/clock_control/nrf_clock_control.h>
#include <clock_control.h>
#include "nrf52840.h"

2
drivers/timer/nrf_rtc_timer.c
View file

@ -7,7 +7,7 @@
#include <soc.h>
#include <clock_control.h>
#include <drivers/clock_control/nrf5_clock_control.h>
#include <drivers/clock_control/nrf_clock_control.h>
#include <system_timer.h>
#include <sys_clock.h>
#include <nrf_rtc.h>

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

@ -21,7 +21,7 @@
#include <usb/usb_device.h>
#include <clock_control.h>
#include <hal/nrf_power.h>
#include <drivers/clock_control/nrf5_clock_control.h>
#include <drivers/clock_control/nrf_clock_control.h>
#include <nrfx_usbd.h>

6
include/drivers/clock_control/nrf5_clock_control.h → include/drivers/clock_control/nrf_clock_control.h
View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#ifndef ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_NRF5_CLOCK_CONTROL_H_
#define ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_NRF5_CLOCK_CONTROL_H_
#ifndef ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_NRF_CLOCK_CONTROL_H_
#define ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_NRF_CLOCK_CONTROL_H_
#if defined(CONFIG_USB) && defined(CONFIG_SOC_NRF52840)
#include <device.h>
@ -51,4 +51,4 @@
void nrf5_power_usb_power_int_enable(bool enable);
#endif
#endif /* ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_NRF5_CLOCK_CONTROL_H_ */
#endif /* ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_NRF_CLOCK_CONTROL_H_ */

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

@ -25,7 +25,7 @@
#include <drivers/bluetooth/hci_driver.h>
#ifdef CONFIG_CLOCK_CONTROL_NRF
#include <drivers/clock_control/nrf5_clock_control.h>
#include <drivers/clock_control/nrf_clock_control.h>
#endif
#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)

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

@ -21,7 +21,7 @@
#include "ll_feat.h"
#if defined(CONFIG_SOC_COMPATIBLE_NRF)
#include <drivers/clock_control/nrf5_clock_control.h>
#include <drivers/clock_control/nrf_clock_control.h>
#endif /* CONFIG_SOC_COMPATIBLE_NRF */
#include "hal/cpu.h"

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

@ -12,7 +12,7 @@
#include <device.h>
#include <clock_control.h>
#ifdef CONFIG_CLOCK_CONTROL_NRF
#include <drivers/clock_control/nrf5_clock_control.h>
#include <drivers/clock_control/nrf_clock_control.h>
#endif
#include <bluetooth/hci.h>