Skip to content
Permalink
Browse files

cleanup: include/: move clock_control.h to drivers/clock_control.h

move clock_control.h to drivers/clock_control.h and
create a shim for backward-compatibility.

No functional changes to the headers.
A warning in the shim can be controlled with CONFIG_COMPAT_INCLUDES.

Related to #16539

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
  • Loading branch information...
nashif committed Jun 25, 2019
1 parent c0c9396 commit 17ddd1714c61e1ef30b1c1df4af3af41b9f556c6
Showing with 278 additions and 263 deletions.
  1. +1 −1 drivers/can/can_mcux_flexcan.c
  2. +1 −1 drivers/can/can_stm32.c
  3. +1 −1 drivers/clock_control/beetle_clock_control.c
  4. +1 −1 drivers/clock_control/clock_control_mcux_ccm.c
  5. +1 −1 drivers/clock_control/clock_control_mcux_pcc.c
  6. +1 −1 drivers/clock_control/clock_control_mcux_scg.c
  7. +1 −1 drivers/clock_control/clock_control_mcux_sim.c
  8. +1 −1 drivers/clock_control/clock_control_rv32m1_pcc.c
  9. +1 −1 drivers/clock_control/clock_stm32_ll_common.c
  10. +1 −1 drivers/clock_control/clock_stm32_ll_mp1.c
  11. +1 −1 drivers/clock_control/clock_stm32f0_f3.c
  12. +1 −1 drivers/clock_control/clock_stm32f1.c
  13. +1 −1 drivers/clock_control/clock_stm32f2_f4_f7.c
  14. +1 −1 drivers/clock_control/clock_stm32l0_l1.c
  15. +1 −1 drivers/clock_control/clock_stm32l4_wb.c
  16. +1 −1 drivers/clock_control/nrf_power_clock.c
  17. +1 −1 drivers/clock_control/quark_se_clock_control.c
  18. +1 −1 drivers/counter/counter_ll_stm32_rtc.c
  19. +1 −1 drivers/counter/counter_nrfx_rtc.c
  20. +1 −1 drivers/entropy/entropy_stm32.c
  21. +1 −1 drivers/ethernet/eth_stm32_hal.c
  22. +1 −1 drivers/flash/flash_stm32.h
  23. +1 −1 drivers/gpio/gpio_dw.c
  24. +1 −1 drivers/gpio/gpio_rv32m1.c
  25. +1 −1 drivers/i2c/i2c_ll_stm32.c
  26. +1 −1 drivers/i2c/i2c_ll_stm32_v1.c
  27. +1 −1 drivers/i2c/i2c_ll_stm32_v2.c
  28. +1 −1 drivers/i2c/i2c_mchp_xec.c
  29. +1 −1 drivers/i2c/i2c_mcux_lpi2c.c
  30. +1 −1 drivers/i2c/i2c_rv32m1_lpi2c.c
  31. +1 −1 drivers/i2s/i2s_ll_stm32.c
  32. +1 −1 drivers/interrupt_controller/rv32m1_intmux.c
  33. +1 −1 drivers/led_strip/ws2812b_sw.c
  34. +1 −1 drivers/pinmux/stm32/pinmux_stm32.h
  35. +1 −1 drivers/rtc/rtc_ll_stm32.c
  36. +1 −1 drivers/sensor/nrf5/temp_nrf5.c
  37. +1 −1 drivers/serial/uart_mcux.c
  38. +1 −1 drivers/serial/uart_mcux_lpsci.c
  39. +1 −1 drivers/serial/uart_mcux_lpuart.c
  40. +1 −1 drivers/serial/uart_rv32m1_lpuart.c
  41. +1 −1 drivers/serial/uart_stm32.c
  42. +1 −1 drivers/spi/spi_dw.c
  43. +1 −1 drivers/spi/spi_ll_stm32.c
  44. +1 −1 drivers/spi/spi_mcux_dspi.c
  45. +1 −1 drivers/spi/spi_mcux_lpspi.c
  46. +1 −1 drivers/timer/nrf_rtc_timer.c
  47. +1 −1 drivers/timer/sam0_rtc_timer.c
  48. +1 −1 drivers/usb/device/usb_dc_nrfx.c
  49. +1 −1 drivers/watchdog/wdt_mcux_wdog.c
  50. +1 −1 ext/hal/nordic/drivers/nrf_radio_802154/platform/clock/nrf_802154_clock_zephyr.c
  51. +4 −203 include/clock_control.h
  52. +214 −0 include/drivers/clock_control.h
  53. +1 −1 include/drivers/clock_control/arm_clock_control.h
  54. +1 −1 include/drivers/clock_control/stm32_clock_control.h
  55. +1 −1 subsys/bluetooth/controller/hci/hci_driver.c
  56. +1 −1 subsys/bluetooth/controller/ll_sw/ctrl.c
  57. +1 −1 subsys/bluetooth/controller/ll_sw/ll.c
  58. +1 −1 subsys/bluetooth/controller/ll_sw/ll_test.c
  59. +1 −1 subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
  60. +1 −1 subsys/bluetooth/controller/ll_sw/nordic/lll/lll_clock.c
  61. +1 −1 subsys/bluetooth/controller/ll_sw/nordic/lll/lll_test.c
  62. +1 −1 tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c
@@ -7,7 +7,7 @@
#include <zephyr.h>
#include <sys/atomic.h>
#include <drivers/can.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <device.h>
#include <misc/byteorder.h>
#include <fsl_flexcan.h>
@@ -5,7 +5,7 @@
*/

#include <clock_control/stm32_clock_control.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <misc/util.h>
#include <string.h>
#include <kernel.h>
@@ -13,7 +13,7 @@
*/

#include <soc.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <misc/util.h>
#include <clock_control/arm_clock_control.h>

@@ -5,7 +5,7 @@
*/
#include <errno.h>
#include <soc.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <dt-bindings/clock/imx_ccm.h>
#include <fsl_clock.h>

@@ -9,7 +9,7 @@

#include <errno.h>
#include <soc.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <fsl_clock.h>

#define LOG_LEVEL CONFIG_CLOCK_CONTROL_LOG_LEVEL
@@ -7,7 +7,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include <clock_control.h>
#include <drivers/clock_control.h>
#include <dt-bindings/clock/kinetis_scg.h>
#include <soc.h>
#include <fsl_clock.h>
@@ -5,7 +5,7 @@
*/
#include <errno.h>
#include <soc.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <dt-bindings/clock/kinetis_sim.h>
#include <fsl_clock.h>

@@ -5,7 +5,7 @@
*/
#include <errno.h>
#include <soc.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <fsl_clock.h>

#define LOG_LEVEL CONFIG_CLOCK_CONTROL_LOG_LEVEL
@@ -7,7 +7,7 @@
*/

#include <soc.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <misc/util.h>
#include <clock_control/stm32_clock_control.h>
#include "clock_stm32_ll_common.h"
@@ -5,7 +5,7 @@
*/

#include <soc.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <misc/util.h>
#include <clock_control/stm32_clock_control.h>

@@ -7,7 +7,7 @@


#include <soc.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <misc/util.h>
#include <clock_control/stm32_clock_control.h>
#include "clock_stm32_ll_common.h"
@@ -7,7 +7,7 @@


#include <soc.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <misc/util.h>
#include <clock_control/stm32_clock_control.h>
#include "clock_stm32_ll_common.h"
@@ -7,7 +7,7 @@


#include <soc.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <misc/util.h>
#include <clock_control/stm32_clock_control.h>
#include "clock_stm32_ll_common.h"
@@ -7,7 +7,7 @@


#include <soc.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <misc/util.h>
#include <clock_control/stm32_clock_control.h>
#include "clock_stm32_ll_common.h"
@@ -7,7 +7,7 @@


#include <soc.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <misc/util.h>
#include <clock_control/stm32_clock_control.h>
#include "clock_stm32_ll_common.h"
@@ -9,7 +9,7 @@
#include <errno.h>
#include <sys/atomic.h>
#include <device.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <misc/__assert.h>
#include <nrf_clock.h>
#if defined(CONFIG_USB) && defined(CONFIG_SOC_NRF52840)
@@ -16,7 +16,7 @@

#include <sys/sys_io.h>

#include <clock_control.h>
#include <drivers/clock_control.h>
#include <clock_control/quark_se_clock_control.h>

#define LOG_LEVEL CONFIG_CLOCK_CONTROL_LOG_LEVEL
@@ -12,7 +12,7 @@
#include <time.h>

#include <clock_control/stm32_clock_control.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <misc/util.h>
#include <kernel.h>
#include <soc.h>
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <counter.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <drivers/clock_control/nrf_clock_control.h>
#include <nrfx_rtc.h>
#ifdef DPPI_PRESENT
@@ -14,7 +14,7 @@
#include <errno.h>
#include <soc.h>
#include <misc/printk.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <clock_control/stm32_clock_control.h>

#if !defined(CONFIG_SOC_SERIES_STM32L4X) && !defined(CONFIG_SOC_SERIES_STM32F4X) && !defined(CONFIG_SOC_SERIES_STM32F7X)
@@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
#include <ethernet/eth_stats.h>
#include <soc.h>
#include <misc/printk.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <clock_control/stm32_clock_control.h>

#include "eth_stm32_hal_priv.h"
@@ -13,7 +13,7 @@
#if defined(CONFIG_SOC_SERIES_STM32L4X) || \
defined(CONFIG_SOC_SERIES_STM32F0X) || \
defined(CONFIG_SOC_SERIES_STM32F3X)
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <clock_control/stm32_clock_control.h>
#endif

@@ -16,7 +16,7 @@
#include <init.h>
#include <misc/util.h>
#include <misc/__assert.h>
#include <clock_control.h>
#include <drivers/clock_control.h>

#ifdef CONFIG_SHARED_IRQ
#include <shared_irq.h>
@@ -12,7 +12,7 @@
#include <soc.h>
#include <fsl_common.h>
#include <fsl_port.h>
#include <clock_control.h>
#include <drivers/clock_control.h>

#include "gpio_utils.h"

@@ -6,7 +6,7 @@
*/

#include <clock_control/stm32_clock_control.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <misc/util.h>
#include <kernel.h>
#include <soc.h>
@@ -9,7 +9,7 @@
*/

#include <clock_control/stm32_clock_control.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <misc/util.h>
#include <kernel.h>
#include <soc.h>
@@ -9,7 +9,7 @@
*/

#include <clock_control/stm32_clock_control.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <misc/util.h>
#include <kernel.h>
#include <soc.h>
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include <clock_control.h>
#include <drivers/clock_control.h>
#include <kernel.h>
#include <soc.h>
#include <errno.h>
@@ -7,7 +7,7 @@

#include <errno.h>
#include <i2c.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <fsl_lpi2c.h>

#include <logging/log.h>
@@ -9,7 +9,7 @@
*/

#include <i2c.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <fsl_lpi2c.h>
#include <logging/log.h>
LOG_MODULE_REGISTER(rv32m1_lpi2c);
@@ -9,7 +9,7 @@
#include <i2s.h>
#include <soc.h>
#include <clock_control/stm32_clock_control.h>
#include <clock_control.h>
#include <drivers/clock_control.h>

#include "i2s_ll_stm32.h"
#include <logging/log.h>
@@ -21,7 +21,7 @@
*/

#include <kernel.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <init.h>
#include <irq.h>
#include <irq_nextlevel.h>
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(ws2812b_sw);
#include <soc.h>
#include <gpio.h>
#include <device.h>
#include <clock_control.h>
#include <drivers/clock_control.h>

#define BLOCKING ((void *)1)

@@ -13,7 +13,7 @@

#include <zephyr/types.h>
#include <stddef.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#ifdef CONFIG_SOC_SERIES_STM32F1X
#include <dt-bindings/pinctrl/stm32-pinctrlf1.h>
#else
@@ -11,7 +11,7 @@
#include <time.h>

#include <clock_control/stm32_clock_control.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <misc/util.h>
#include <kernel.h>
#include <soc.h>
@@ -6,7 +6,7 @@

#include <device.h>
#include <sensor.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <logging/log.h>

#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL
@@ -7,7 +7,7 @@
#include <errno.h>
#include <device.h>
#include <uart.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <fsl_uart.h>
#include <soc.h>

@@ -7,7 +7,7 @@
#include <errno.h>
#include <device.h>
#include <uart.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <fsl_lpsci.h>
#include <soc.h>

@@ -7,7 +7,7 @@
#include <errno.h>
#include <device.h>
#include <uart.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <fsl_lpuart.h>
#include <soc.h>

@@ -8,7 +8,7 @@
#include <errno.h>
#include <device.h>
#include <uart.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <fsl_lpuart.h>
#include <soc.h>

@@ -18,7 +18,7 @@
#include <soc.h>
#include <init.h>
#include <uart.h>
#include <clock_control.h>
#include <drivers/clock_control.h>

#include <linker/sections.h>
#include <clock_control/stm32_clock_control.h>
@@ -33,7 +33,7 @@ LOG_MODULE_REGISTER(spi_dw);
#include <init.h>

#include <sys/sys_io.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <misc/util.h>

#ifdef CONFIG_IOAPIC
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(spi_ll_stm32);
#include <toolchain.h>

#include <clock_control/stm32_clock_control.h>
#include <clock_control.h>
#include <drivers/clock_control.h>

#include "spi_ll_stm32.h"

@@ -7,7 +7,7 @@

#include <errno.h>
#include <spi.h>
#include <clock_control.h>
#include <drivers/clock_control.h>
#include <fsl_dspi.h>

#define LOG_LEVEL CONFIG_SPI_LOG_LEVEL

0 comments on commit 17ddd17

Please sign in to comment.
You can’t perform that action at this time.