arm: remove plat/machine/timer.h

plat/machine/timer.h is unused on arm, so remove it and fix up the
includes.

include/arch/riscv/arch/machine/timer.h

@@ -9,9 +9,9 @@
  *
  * @TAG(DATA61_GPL)
  */
+#ifndef __ARCH_MACHINE_TIMER_H
+#define __ARCH_MACHINE_TIMER_H
 
-#ifndef __PLAT_MACHINE_TIMER_H
-#define __PLAT_MACHINE_TIMER_H
+#include <plat/machine/timer.h>
 
-
-#endif /* !__PLAT_MACHINE_TIMER_H */
+#endif /* __ARCH_MACHINE_TIMER_H */

include/arch/x86/arch/machine/timer.h

@@ -15,6 +15,7 @@
 #include <config.h>
 #include <arch/model/statedata.h>
 #include <plat/machine.h>
+#include <plat/machine/timer.h>
 
 BOOT_CODE uint32_t tsc_init(void);
 

include/machine/timer.h

@@ -10,6 +10,8 @@
 #ifndef __TIMER_H
 #define __TIMER_H
 
+#include <arch/machine/timer.h>
+
 static inline void resetTimer(void);
 
 #endif

src/arch/arm/kernel/boot.c

@@ -23,7 +23,6 @@
 #include <linker.h>
 #include <plat/machine/hardware.h>
 #include <machine.h>
-#include <plat/machine/timer.h>
 #include <arch/machine/timer.h>
 #include <arch/machine/fpu.h>
 #include <arch/machine/tlb.h>

src/drivers/timer/allwinner-timer.c

@@ -17,7 +17,6 @@
 #include <plat/machine.h>
 #include <linker.h>
 #include <plat/machine/hardware.h>
-#include <plat/machine/timer.h>
 
 #define TIMER_CTL_EN_FLAG               BIT(0)
 #define TIMER_CTL_RELOAD_FLAG           BIT(1)

src/drivers/timer/am335x-timer.c

@@ -18,7 +18,6 @@
 #include <linker.h>
 #include <plat/machine/devices_gen.h>
 #include <plat/machine/hardware.h>
-#include <plat/machine/timer.h>
 
 #define TIOCP_CFG_SOFTRESET BIT(0)
 

src/drivers/timer/exynos4412-mct.c

@@ -13,7 +13,6 @@
 #include <types.h>
 #include <plat/machine.h>
 #include <linker.h>
-#include <plat/machine/timer.h>
 #include <drivers/timer/mct.h>
 
 timer_t *mct = (timer_t *) EXYNOS_MCT_PPTR;

src/drivers/timer/generic_timer.c

@@ -10,7 +10,6 @@
  * @TAG(DATA61_GPL)
  */
 
-#include <plat/machine/timer.h>
 #include <drivers/timer/arm_generic.h>
 
 BOOT_CODE void initGenericTimer(void)

src/drivers/timer/kpss-timer.c

@@ -10,7 +10,6 @@
 /* @AUTHOR(akroh@ertos.nicta.com.au) */
 
 #include <plat/machine/hardware.h>
-#include <plat/machine/timer.h>
 
 #define DGT_TIMER_PPTR (TIMER_PPTR + 0x024)
 

src/drivers/timer/omap3430-timer.c

@@ -18,7 +18,6 @@
 #include <linker.h>
 #include <plat/machine/devices_gen.h>
 #include <plat/machine/hardware.h>
-#include <plat/machine/timer.h>
 
 #define TIMER_INTERVAL_MS (CONFIG_TIMER_TICK_MS)
 

src/object/interrupt.c

@@ -22,7 +22,6 @@
 #include <kernel/thread.h>
 #include <model/statedata.h>
 #include <machine/timer.h>
-#include <plat/machine/timer.h>
 #include <smp/ipi.h>
 
 exception_t decodeIRQControlInvocation(word_t invLabel, word_t length,

src/plat/imx31/machine/hardware.c

@@ -17,7 +17,6 @@
 #include <plat/machine.h>
 #include <linker.h>
 #include <plat/machine/hardware.h>
-#include <plat/machine/timer.h>
 
 #define L2_LINE_SIZE_BITS 5
 #define L2_LINE_SIZE BIT(L2_LINE_SIZE_BITS)

src/plat/omap3/machine/hardware.c

@@ -18,7 +18,6 @@
 #include <linker.h>
 #include <plat/machine/devices_gen.h>
 #include <plat/machine/hardware.h>
-#include <plat/machine/timer.h>
 
 #define INTCPS_SYSCONFIG_SOFTRESET BIT(1)
 #define INTCPS_SYSSTATUS_RESETDONE BIT(0)