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 zephyrproject-rtos#16539 Signed-off-by: Anas Nashif <[email protected]>
mlaz · Jun 28, 2019 · 17ddd17 · 17ddd17
1 parent c0c9396
commit 17ddd17
Show file tree

Hide file tree

Showing 62 changed files with 278 additions and 263 deletions.
diff --git a/drivers/can/can_mcux_flexcan.c b/drivers/can/can_mcux_flexcan.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>

diff --git a/drivers/can/can_stm32.c b/drivers/can/can_stm32.c
@@ -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>

diff --git a/drivers/clock_control/beetle_clock_control.c b/drivers/clock_control/beetle_clock_control.c
@@ -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>
 

diff --git a/drivers/clock_control/clock_control_mcux_ccm.c b/drivers/clock_control/clock_control_mcux_ccm.c
@@ -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>
 

diff --git a/drivers/clock_control/clock_control_mcux_pcc.c b/drivers/clock_control/clock_control_mcux_pcc.c
@@ -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

diff --git a/drivers/clock_control/clock_control_mcux_scg.c b/drivers/clock_control/clock_control_mcux_scg.c
@@ -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>

diff --git a/drivers/clock_control/clock_control_mcux_sim.c b/drivers/clock_control/clock_control_mcux_sim.c
@@ -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>
 

diff --git a/drivers/clock_control/clock_control_rv32m1_pcc.c b/drivers/clock_control/clock_control_rv32m1_pcc.c
@@ -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

diff --git a/drivers/clock_control/clock_stm32_ll_common.c b/drivers/clock_control/clock_stm32_ll_common.c
@@ -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"

diff --git a/drivers/clock_control/clock_stm32_ll_mp1.c b/drivers/clock_control/clock_stm32_ll_mp1.c
@@ -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>
 

diff --git a/drivers/clock_control/clock_stm32f0_f3.c b/drivers/clock_control/clock_stm32f0_f3.c
@@ -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"

diff --git a/drivers/clock_control/clock_stm32f1.c b/drivers/clock_control/clock_stm32f1.c
@@ -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"

diff --git a/drivers/clock_control/clock_stm32f2_f4_f7.c b/drivers/clock_control/clock_stm32f2_f4_f7.c
@@ -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"

diff --git a/drivers/clock_control/clock_stm32l0_l1.c b/drivers/clock_control/clock_stm32l0_l1.c
@@ -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"

diff --git a/drivers/clock_control/clock_stm32l4_wb.c b/drivers/clock_control/clock_stm32l4_wb.c
@@ -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"

diff --git a/drivers/clock_control/nrf_power_clock.c b/drivers/clock_control/nrf_power_clock.c
@@ -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)

diff --git a/drivers/clock_control/quark_se_clock_control.c b/drivers/clock_control/quark_se_clock_control.c
@@ -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

diff --git a/drivers/counter/counter_ll_stm32_rtc.c b/drivers/counter/counter_ll_stm32_rtc.c
@@ -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>

diff --git a/drivers/counter/counter_nrfx_rtc.c b/drivers/counter/counter_nrfx_rtc.c
@@ -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

diff --git a/drivers/entropy/entropy_stm32.c b/drivers/entropy/entropy_stm32.c
@@ -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)

diff --git a/drivers/ethernet/eth_stm32_hal.c b/drivers/ethernet/eth_stm32_hal.c
@@ -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"

diff --git a/drivers/flash/flash_stm32.h b/drivers/flash/flash_stm32.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
 

diff --git a/drivers/gpio/gpio_dw.c b/drivers/gpio/gpio_dw.c
@@ -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>

diff --git a/drivers/gpio/gpio_rv32m1.c b/drivers/gpio/gpio_rv32m1.c
@@ -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"
 

diff --git a/drivers/i2c/i2c_ll_stm32.c b/drivers/i2c/i2c_ll_stm32.c
@@ -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>

diff --git a/drivers/i2c/i2c_ll_stm32_v1.c b/drivers/i2c/i2c_ll_stm32_v1.c
@@ -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>

diff --git a/drivers/i2c/i2c_ll_stm32_v2.c b/drivers/i2c/i2c_ll_stm32_v2.c
@@ -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>

diff --git a/drivers/i2c/i2c_mchp_xec.c b/drivers/i2c/i2c_mchp_xec.c
@@ -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>

diff --git a/drivers/i2c/i2c_mcux_lpi2c.c b/drivers/i2c/i2c_mcux_lpi2c.c
@@ -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>

diff --git a/drivers/i2c/i2c_rv32m1_lpi2c.c b/drivers/i2c/i2c_rv32m1_lpi2c.c
@@ -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);

diff --git a/drivers/i2s/i2s_ll_stm32.c b/drivers/i2s/i2s_ll_stm32.c
@@ -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>

diff --git a/drivers/interrupt_controller/rv32m1_intmux.c b/drivers/interrupt_controller/rv32m1_intmux.c
@@ -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>

diff --git a/drivers/led_strip/ws2812b_sw.c b/drivers/led_strip/ws2812b_sw.c
@@ -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)
 

diff --git a/drivers/pinmux/stm32/pinmux_stm32.h b/drivers/pinmux/stm32/pinmux_stm32.h
@@ -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

diff --git a/drivers/rtc/rtc_ll_stm32.c b/drivers/rtc/rtc_ll_stm32.c
@@ -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>

diff --git a/drivers/sensor/nrf5/temp_nrf5.c b/drivers/sensor/nrf5/temp_nrf5.c
@@ -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

diff --git a/drivers/serial/uart_mcux.c b/drivers/serial/uart_mcux.c
@@ -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>
 

diff --git a/drivers/serial/uart_mcux_lpsci.c b/drivers/serial/uart_mcux_lpsci.c
@@ -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>
 

diff --git a/drivers/serial/uart_mcux_lpuart.c b/drivers/serial/uart_mcux_lpuart.c
@@ -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>
 

diff --git a/drivers/serial/uart_rv32m1_lpuart.c b/drivers/serial/uart_rv32m1_lpuart.c
@@ -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>
 

diff --git a/drivers/serial/uart_stm32.c b/drivers/serial/uart_stm32.c
@@ -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>

diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c
@@ -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

diff --git a/drivers/spi/spi_ll_stm32.c b/drivers/spi/spi_ll_stm32.c
@@ -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"
 

diff --git a/drivers/spi/spi_mcux_dspi.c b/drivers/spi/spi_mcux_dspi.c
@@ -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