From 68c389c1f82aa2c6fedb0d077de31d86cd36bce2 Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Fri, 21 Jun 2019 12:55:37 -0400
Subject: [PATCH] include: move system timer headers to include/drivers/timer/

Move internal and architecture specific headers from include/drivers to
subfolder for timer:

   include/drivers/timer

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
---
 drivers/timer/altera_avalon_timer_hal.c    | 2 +-
 drivers/timer/arcv2_timer0.c               | 2 +-
 drivers/timer/cortex_m_systick.c           | 2 +-
 drivers/timer/hpet.c                       | 2 +-
 drivers/timer/litex_timer.c                | 2 +-
 drivers/timer/loapic_timer.c               | 2 +-
 drivers/timer/native_posix_timer.c         | 2 +-
 drivers/timer/nrf_rtc_timer.c              | 2 +-
 drivers/timer/riscv_machine_timer.c        | 2 +-
 drivers/timer/rv32m1_lptmr_timer.c         | 2 +-
 drivers/timer/sam0_rtc_timer.c             | 2 +-
 drivers/timer/sys_clock_init.c             | 2 +-
 drivers/timer/xtensa_sys_timer.c           | 2 +-
 include/drivers/{ => timer}/system_timer.h | 0
 kernel/idle.c                              | 2 +-
 kernel/sched.c                             | 2 +-
 kernel/thread.c                            | 2 +-
 kernel/timeout.c                           | 2 +-
 subsys/power/reboot.c                      | 2 +-
 subsys/random/rand32_timer.c               | 2 +-
 20 files changed, 19 insertions(+), 19 deletions(-)
 rename include/drivers/{ => timer}/system_timer.h (100%)

diff --git a/drivers/timer/altera_avalon_timer_hal.c b/drivers/timer/altera_avalon_timer_hal.c
index b465d7955e7..5a97b7efacc 100644
--- a/drivers/timer/altera_avalon_timer_hal.c
+++ b/drivers/timer/altera_avalon_timer_hal.c
@@ -7,7 +7,7 @@
 #include <kernel.h>
 #include <arch/cpu.h>
 #include <device.h>
-#include <system_timer.h>
+#include <drivers/timer/system_timer.h>
 #include <altera_common.h>
 
 #include "altera_avalon_timer_regs.h"
diff --git a/drivers/timer/arcv2_timer0.c b/drivers/timer/arcv2_timer0.c
index 0df1c549220..d272bad67cb 100644
--- a/drivers/timer/arcv2_timer0.c
+++ b/drivers/timer/arcv2_timer0.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/system_timer.h>
+#include <drivers/timer/system_timer.h>
 #include <sys_clock.h>
 #include <spinlock.h>
 #include <arch/arc/v2/aux_regs.h>
diff --git a/drivers/timer/cortex_m_systick.c b/drivers/timer/cortex_m_systick.c
index 502243925c0..b58d3ecf4d2 100644
--- a/drivers/timer/cortex_m_systick.c
+++ b/drivers/timer/cortex_m_systick.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <drivers/system_timer.h>
+#include <drivers/timer/system_timer.h>
 #include <sys_clock.h>
 #include <spinlock.h>
 #include <arch/arm/cortex_m/cmsis.h>
diff --git a/drivers/timer/hpet.c b/drivers/timer/hpet.c
index b0694012df1..3f08e096cf2 100644
--- a/drivers/timer/hpet.c
+++ b/drivers/timer/hpet.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <drivers/system_timer.h>
+#include <drivers/timer/system_timer.h>
 #include <sys_clock.h>
 #include <spinlock.h>
 
diff --git a/drivers/timer/litex_timer.c b/drivers/timer/litex_timer.c
index 3d0dc870893..f6d0b0181cb 100644
--- a/drivers/timer/litex_timer.c
+++ b/drivers/timer/litex_timer.c
@@ -8,7 +8,7 @@
 #include <arch/cpu.h>
 #include <device.h>
 #include <irq.h>
-#include <system_timer.h>
+#include <drivers/timer/system_timer.h>
 
 #define TIMER_BASE		DT_LITEX_TIMER0_E0002800_BASE_ADDRESS
 #define TIMER_LOAD_ADDR		((TIMER_BASE) + 0x00)
diff --git a/drivers/timer/loapic_timer.c b/drivers/timer/loapic_timer.c
index d28b8ca2671..3824aa86e67 100644
--- a/drivers/timer/loapic_timer.c
+++ b/drivers/timer/loapic_timer.c
@@ -60,7 +60,7 @@
 #include <toolchain.h>
 #include <linker/sections.h>
 #include <sys_clock.h>
-#include <drivers/system_timer.h>
+#include <drivers/timer/system_timer.h>
 #include <arch/x86/irq_controller.h>
 #include <power.h>
 #include <device.h>
diff --git a/drivers/timer/native_posix_timer.c b/drivers/timer/native_posix_timer.c
index e15606e12f2..56e200126e4 100644
--- a/drivers/timer/native_posix_timer.c
+++ b/drivers/timer/native_posix_timer.c
@@ -14,7 +14,7 @@
 #include "zephyr/types.h"
 #include "irq.h"
 #include "device.h"
-#include "drivers/system_timer.h"
+#include <drivers/timer/system_timer.h>
 #include "sys_clock.h"
 #include "timer_model.h"
 #include "soc.h"
diff --git a/drivers/timer/nrf_rtc_timer.c b/drivers/timer/nrf_rtc_timer.c
index 59197f98b47..2287ad4472b 100644
--- a/drivers/timer/nrf_rtc_timer.c
+++ b/drivers/timer/nrf_rtc_timer.c
@@ -8,7 +8,7 @@
 #include <soc.h>
 #include <clock_control.h>
 #include <drivers/clock_control/nrf_clock_control.h>
-#include <system_timer.h>
+#include <drivers/timer/system_timer.h>
 #include <sys_clock.h>
 #include <nrf_rtc.h>
 #include <spinlock.h>
diff --git a/drivers/timer/riscv_machine_timer.c b/drivers/timer/riscv_machine_timer.c
index bcc8dfbe720..152d2dc6520 100644
--- a/drivers/timer/riscv_machine_timer.c
+++ b/drivers/timer/riscv_machine_timer.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <drivers/system_timer.h>
+#include <drivers/timer/system_timer.h>
 #include <sys_clock.h>
 #include <spinlock.h>
 #include <soc.h>
diff --git a/drivers/timer/rv32m1_lptmr_timer.c b/drivers/timer/rv32m1_lptmr_timer.c
index 8430d68d8c3..efd7a4f1af3 100644
--- a/drivers/timer/rv32m1_lptmr_timer.c
+++ b/drivers/timer/rv32m1_lptmr_timer.c
@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 #include <misc/util.h>
-#include <system_timer.h>
+#include <drivers/timer/system_timer.h>
 #include <soc.h>
 
 /*
diff --git a/drivers/timer/sam0_rtc_timer.c b/drivers/timer/sam0_rtc_timer.c
index df6ad340f43..561b75f034b 100644
--- a/drivers/timer/sam0_rtc_timer.c
+++ b/drivers/timer/sam0_rtc_timer.c
@@ -16,7 +16,7 @@
 
 #include <soc.h>
 #include <clock_control.h>
-#include <system_timer.h>
+#include <drivers/timer/system_timer.h>
 #include <sys_clock.h>
 
 /* RTC registers. */
diff --git a/drivers/timer/sys_clock_init.c b/drivers/timer/sys_clock_init.c
index 4312470ab28..86ed718eb66 100644
--- a/drivers/timer/sys_clock_init.c
+++ b/drivers/timer/sys_clock_init.c
@@ -14,7 +14,7 @@
 
 #include <kernel.h>
 #include <init.h>
-#include <drivers/system_timer.h>
+#include <drivers/timer/system_timer.h>
 
 /* Weak-linked noop defaults for optional driver interfaces: */
 
diff --git a/drivers/timer/xtensa_sys_timer.c b/drivers/timer/xtensa_sys_timer.c
index 6009b538219..941321192e6 100644
--- a/drivers/timer/xtensa_sys_timer.c
+++ b/drivers/timer/xtensa_sys_timer.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <drivers/system_timer.h>
+#include <drivers/timer/system_timer.h>
 #include <sys_clock.h>
 #include <spinlock.h>
 #include <xtensa_rtos.h>
diff --git a/include/drivers/system_timer.h b/include/drivers/timer/system_timer.h
similarity index 100%
rename from include/drivers/system_timer.h
rename to include/drivers/timer/system_timer.h
diff --git a/kernel/idle.c b/kernel/idle.c
index 770ac04f66e..0bb25dba7f2 100644
--- a/kernel/idle.c
+++ b/kernel/idle.c
@@ -8,7 +8,7 @@
 #include <kernel_structs.h>
 #include <toolchain.h>
 #include <linker/sections.h>
-#include <drivers/system_timer.h>
+#include <drivers/timer/system_timer.h>
 #include <wait_q.h>
 #include <power.h>
 #include <stdbool.h>
diff --git a/kernel/sched.c b/kernel/sched.c
index e722b7a24ef..49b78b4a995 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -11,7 +11,7 @@
 #include <kswap.h>
 #include <kernel_arch_func.h>
 #include <syscall_handler.h>
-#include <drivers/system_timer.h>
+#include <drivers/timer/system_timer.h>
 #include <stdbool.h>
 
 #if defined(CONFIG_SCHED_DUMB)
diff --git a/kernel/thread.c b/kernel/thread.c
index b2494a48a64..e6d30fe37f1 100644
--- a/kernel/thread.c
+++ b/kernel/thread.c
@@ -21,7 +21,7 @@
 #include <misc/printk.h>
 #include <misc/math_extras.h>
 #include <sys_clock.h>
-#include <drivers/system_timer.h>
+#include <drivers/timer/system_timer.h>
 #include <ksched.h>
 #include <wait_q.h>
 #include <atomic.h>
diff --git a/kernel/timeout.c b/kernel/timeout.c
index f3beba4fcda..9801fb9714e 100644
--- a/kernel/timeout.c
+++ b/kernel/timeout.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <timeout_q.h>
-#include <drivers/system_timer.h>
+#include <drivers/timer/system_timer.h>
 #include <sys_clock.h>
 #include <spinlock.h>
 #include <ksched.h>
diff --git a/subsys/power/reboot.c b/subsys/power/reboot.c
index 8243dce7aa5..212089c4beb 100644
--- a/subsys/power/reboot.c
+++ b/subsys/power/reboot.c
@@ -11,7 +11,7 @@
  */
 
 #include <kernel.h>
-#include <drivers/system_timer.h>
+#include <drivers/timer/system_timer.h>
 #include <misc/printk.h>
 #include <misc/reboot.h>
 
diff --git a/subsys/random/rand32_timer.c b/subsys/random/rand32_timer.c
index 87c5b9d35b7..00c78a6540e 100644
--- a/subsys/random/rand32_timer.c
+++ b/subsys/random/rand32_timer.c
@@ -15,7 +15,7 @@
  */
 
 #include <random/rand32.h>
-#include <drivers/system_timer.h>
+#include <drivers/timer/system_timer.h>
 #include <kernel.h>
 #include <atomic.h>