From 12b2ee54e3379a68d0b45675fb58c57ca12f3733 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Mon, 28 Aug 2023 13:15:43 +0200
Subject: [PATCH] drivers: timer: s/device.h/init.h

Timer "drivers" do not use the device model infrastructure, they are
singletons with a SYS_INIT call. This means they do not have to include
device.h but init.h. Things worked because device.h includes init.h.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
---
 drivers/timer/altera_avalon_timer_hal.c | 2 +-
 drivers/timer/apic_timer.c              | 2 +-
 drivers/timer/apic_tsc.c                | 2 +-
 drivers/timer/arcv2_timer0.c            | 2 +-
 drivers/timer/arm_arch_timer.c          | 2 +-
 drivers/timer/cc13xx_cc26xx_rtc_timer.c | 2 +-
 drivers/timer/cortex_m_systick.c        | 2 +-
 drivers/timer/esp32c3_sys_timer.c       | 2 +-
 drivers/timer/gecko_burtc_timer.c       | 2 +-
 drivers/timer/hpet.c                    | 2 +-
 drivers/timer/intel_adsp_timer.c        | 2 +-
 drivers/timer/ite_it8xxx2_timer.c       | 2 +-
 drivers/timer/leon_gptimer.c            | 2 +-
 drivers/timer/litex_timer.c             | 2 +-
 drivers/timer/mchp_xec_rtos_timer.c     | 2 +-
 drivers/timer/mcux_gpt_timer.c          | 2 +-
 drivers/timer/mcux_lptmr_timer.c        | 2 +-
 drivers/timer/mcux_os_timer.c           | 2 +-
 drivers/timer/mips_cp0_timer.c          | 2 +-
 drivers/timer/native_posix_timer.c      | 2 +-
 drivers/timer/npcx_itim_timer.c         | 2 +-
 drivers/timer/nrf_rtc_timer.c           | 2 +-
 drivers/timer/rcar_cmt_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/stm32_lptim_timer.c       | 2 +-
 drivers/timer/xlnx_psttc_timer.c        | 2 +-
 drivers/timer/xtensa_sys_timer.c        | 2 +-
 29 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/drivers/timer/altera_avalon_timer_hal.c b/drivers/timer/altera_avalon_timer_hal.c
index f2dc1082f3..9a01e1be63 100644
--- a/drivers/timer/altera_avalon_timer_hal.c
+++ b/drivers/timer/altera_avalon_timer_hal.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/arch/cpu.h>
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <altera_common.h>
 #include <zephyr/irq.h>
diff --git a/drivers/timer/apic_timer.c b/drivers/timer/apic_timer.c
index 55e3da8b32..cf28acb04d 100644
--- a/drivers/timer/apic_timer.c
+++ b/drivers/timer/apic_timer.c
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/sys_clock.h>
 #include <zephyr/spinlock.h>
diff --git a/drivers/timer/apic_tsc.c b/drivers/timer/apic_tsc.c
index d3c37ff4ac..59b0017375 100644
--- a/drivers/timer/apic_tsc.c
+++ b/drivers/timer/apic_tsc.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2021 Intel Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/sys_clock.h>
 #include <zephyr/spinlock.h>
diff --git a/drivers/timer/arcv2_timer0.c b/drivers/timer/arcv2_timer0.c
index 84b5455b9a..9469bc67d3 100644
--- a/drivers/timer/arcv2_timer0.c
+++ b/drivers/timer/arcv2_timer0.c
@@ -4,7 +4,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/sys_clock.h>
 #include <zephyr/spinlock.h>
diff --git a/drivers/timer/arm_arch_timer.c b/drivers/timer/arm_arch_timer.c
index 4a62c52de9..a9a762d9af 100644
--- a/drivers/timer/arm_arch_timer.c
+++ b/drivers/timer/arm_arch_timer.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <zephyr/drivers/timer/arm_arch_timer.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/irq.h>
diff --git a/drivers/timer/cc13xx_cc26xx_rtc_timer.c b/drivers/timer/cc13xx_cc26xx_rtc_timer.c
index 9a64c77924..3d45fb7d7d 100644
--- a/drivers/timer/cc13xx_cc26xx_rtc_timer.c
+++ b/drivers/timer/cc13xx_cc26xx_rtc_timer.c
@@ -15,7 +15,7 @@
  * the comparator value set is reached.
  */
 
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/timer/system_timer.h>
diff --git a/drivers/timer/cortex_m_systick.c b/drivers/timer/cortex_m_systick.c
index 24c1457472..f415f99ea0 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 <zephyr/device.h>
+#include <zephyr/init.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/sys_clock.h>
 #include <zephyr/spinlock.h>
diff --git a/drivers/timer/esp32c3_sys_timer.c b/drivers/timer/esp32c3_sys_timer.c
index 9974654077..b54150c71c 100644
--- a/drivers/timer/esp32c3_sys_timer.c
+++ b/drivers/timer/esp32c3_sys_timer.c
@@ -17,7 +17,7 @@
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/sys_clock.h>
 #include <soc.h>
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <zephyr/spinlock.h>
 
 #define CYC_PER_TICK ((uint32_t)((uint64_t)sys_clock_hw_cycles_per_sec()	\
diff --git a/drivers/timer/gecko_burtc_timer.c b/drivers/timer/gecko_burtc_timer.c
index e3d077d420..110efa5f92 100644
--- a/drivers/timer/gecko_burtc_timer.c
+++ b/drivers/timer/gecko_burtc_timer.c
@@ -16,7 +16,7 @@
  *
  */
 
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/timer/system_timer.h>
diff --git a/drivers/timer/hpet.c b/drivers/timer/hpet.c
index f51b0c1e77..8a7134a762 100644
--- a/drivers/timer/hpet.c
+++ b/drivers/timer/hpet.c
@@ -5,7 +5,7 @@
  */
 
 #define DT_DRV_COMPAT intel_hpet
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/sys_clock.h>
 #include <zephyr/spinlock.h>
diff --git a/drivers/timer/intel_adsp_timer.c b/drivers/timer/intel_adsp_timer.c
index de6955dd40..116a512f8f 100644
--- a/drivers/timer/intel_adsp_timer.c
+++ b/drivers/timer/intel_adsp_timer.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/sys_clock.h>
 #include <zephyr/spinlock.h>
diff --git a/drivers/timer/ite_it8xxx2_timer.c b/drivers/timer/ite_it8xxx2_timer.c
index 47b8a3aaf2..c29c978d18 100644
--- a/drivers/timer/ite_it8xxx2_timer.c
+++ b/drivers/timer/ite_it8xxx2_timer.c
@@ -5,7 +5,7 @@
 
 #define DT_DRV_COMPAT ite_it8xxx2_timer
 
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/dt-bindings/interrupt-controller/ite-intc.h>
 #include <soc.h>
diff --git a/drivers/timer/leon_gptimer.c b/drivers/timer/leon_gptimer.c
index a223d8e153..820d2aff0c 100644
--- a/drivers/timer/leon_gptimer.c
+++ b/drivers/timer/leon_gptimer.c
@@ -12,7 +12,7 @@
 
 #define DT_DRV_COMPAT gaisler_gptimer
 
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/irq.h>
 #include <zephyr/sys_clock.h>
diff --git a/drivers/timer/litex_timer.c b/drivers/timer/litex_timer.c
index a4ba243530..ecc5b22a9d 100644
--- a/drivers/timer/litex_timer.c
+++ b/drivers/timer/litex_timer.c
@@ -8,7 +8,7 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/arch/cpu.h>
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <zephyr/irq.h>
 #include <zephyr/spinlock.h>
 #include <zephyr/drivers/timer/system_timer.h>
diff --git a/drivers/timer/mchp_xec_rtos_timer.c b/drivers/timer/mchp_xec_rtos_timer.c
index 223c61e470..18be700d5a 100644
--- a/drivers/timer/mchp_xec_rtos_timer.c
+++ b/drivers/timer/mchp_xec_rtos_timer.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT microchip_xec_rtos_timer
 
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <zephyr/devicetree.h>
 #include <soc.h>
 #include <zephyr/drivers/timer/system_timer.h>
diff --git a/drivers/timer/mcux_gpt_timer.c b/drivers/timer/mcux_gpt_timer.c
index a7718fefaa..99798a9dd5 100644
--- a/drivers/timer/mcux_gpt_timer.c
+++ b/drivers/timer/mcux_gpt_timer.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT nxp_gpt_hw_timer
 
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <fsl_gpt.h>
 #include <zephyr/sys_clock.h>
diff --git a/drivers/timer/mcux_lptmr_timer.c b/drivers/timer/mcux_lptmr_timer.c
index 65566b434d..e91c11112f 100644
--- a/drivers/timer/mcux_lptmr_timer.c
+++ b/drivers/timer/mcux_lptmr_timer.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT nxp_kinetis_lptmr
 
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/kernel.h>
 #include <zephyr/sys/time_units.h>
diff --git a/drivers/timer/mcux_os_timer.c b/drivers/timer/mcux_os_timer.c
index 18dcb9e5fd..f65459505a 100644
--- a/drivers/timer/mcux_os_timer.c
+++ b/drivers/timer/mcux_os_timer.c
@@ -8,7 +8,7 @@
 
 #include <limits.h>
 
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/irq.h>
 #include <zephyr/sys_clock.h>
diff --git a/drivers/timer/mips_cp0_timer.c b/drivers/timer/mips_cp0_timer.c
index 81af49ab95..2454cdcca6 100644
--- a/drivers/timer/mips_cp0_timer.c
+++ b/drivers/timer/mips_cp0_timer.c
@@ -9,7 +9,7 @@
 
 #include <limits.h>
 
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/irq.h>
 #include <zephyr/sys_clock.h>
diff --git a/drivers/timer/native_posix_timer.c b/drivers/timer/native_posix_timer.c
index 9f0b10fcb1..efe54e54bf 100644
--- a/drivers/timer/native_posix_timer.c
+++ b/drivers/timer/native_posix_timer.c
@@ -12,7 +12,7 @@
  */
 #include "zephyr/types.h"
 #include <zephyr/irq.h>
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/sys_clock.h>
 #include "timer_model.h"
diff --git a/drivers/timer/npcx_itim_timer.c b/drivers/timer/npcx_itim_timer.c
index 66409e235c..a54db566d9 100644
--- a/drivers/timer/npcx_itim_timer.c
+++ b/drivers/timer/npcx_itim_timer.c
@@ -34,7 +34,7 @@
  *   "sleep/deep sleep" power state if CONFIG_PM is enabled.
  */
 
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/kernel.h>
diff --git a/drivers/timer/nrf_rtc_timer.c b/drivers/timer/nrf_rtc_timer.c
index 8ec9878019..4410529608 100644
--- a/drivers/timer/nrf_rtc_timer.c
+++ b/drivers/timer/nrf_rtc_timer.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
diff --git a/drivers/timer/rcar_cmt_timer.c b/drivers/timer/rcar_cmt_timer.c
index 925c7f472e..164b7cd39e 100644
--- a/drivers/timer/rcar_cmt_timer.c
+++ b/drivers/timer/rcar_cmt_timer.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/arch/cpu.h>
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/drivers/clock_control.h>
diff --git a/drivers/timer/riscv_machine_timer.c b/drivers/timer/riscv_machine_timer.c
index 7ddbc359df..abfb28a962 100644
--- a/drivers/timer/riscv_machine_timer.c
+++ b/drivers/timer/riscv_machine_timer.c
@@ -6,7 +6,7 @@
 
 #include <limits.h>
 
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/sys_clock.h>
diff --git a/drivers/timer/rv32m1_lptmr_timer.c b/drivers/timer/rv32m1_lptmr_timer.c
index d628dcbe2c..09e7d88bd1 100644
--- a/drivers/timer/rv32m1_lptmr_timer.c
+++ b/drivers/timer/rv32m1_lptmr_timer.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT openisa_rv32m1_lptmr
 
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <zephyr/kernel.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/drivers/timer/system_timer.h>
diff --git a/drivers/timer/sam0_rtc_timer.c b/drivers/timer/sam0_rtc_timer.c
index 10e7b36d63..8e87b1848b 100644
--- a/drivers/timer/sam0_rtc_timer.c
+++ b/drivers/timer/sam0_rtc_timer.c
@@ -16,7 +16,7 @@
  * generate an interrupt every tick.
  */
 
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/timer/system_timer.h>
diff --git a/drivers/timer/stm32_lptim_timer.c b/drivers/timer/stm32_lptim_timer.c
index 839e16b52a..aaf83c3005 100644
--- a/drivers/timer/stm32_lptim_timer.c
+++ b/drivers/timer/stm32_lptim_timer.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <stm32_ll_lptim.h>
 #include <stm32_ll_bus.h>
diff --git a/drivers/timer/xlnx_psttc_timer.c b/drivers/timer/xlnx_psttc_timer.c
index f9bb7ff1e4..c50f104e20 100644
--- a/drivers/timer/xlnx_psttc_timer.c
+++ b/drivers/timer/xlnx_psttc_timer.c
@@ -8,7 +8,7 @@
 #define DT_DRV_COMPAT xlnx_ttcps
 
 #include <zephyr/arch/cpu.h>
-#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <zephyr/irq.h>
 #include <zephyr/sys_clock.h>
 #include <soc.h>
diff --git a/drivers/timer/xtensa_sys_timer.c b/drivers/timer/xtensa_sys_timer.c
index e3fe740380..7ffd46c7c2 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 <zephyr/device.h>
+#include <zephyr/init.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/sys_clock.h>
 #include <zephyr/spinlock.h>