trivial: consolidate timer function declarations

This moves all timer function declarations to a single
header instead of duplication them for each platform

include/machine/timer.h

@@ -7,9 +7,12 @@
  *
  * @TAG(GD_GPL)
  */
+#ifndef __TIMER_H
+#define __TIMER_H
 
 /** MODIFIES: [*] */
 void resetTimer(void);
 /** MODIFIES: [*] */
 void initTimer(void);
 
+#endif

include/plat/allwinnerA20/plat/machine/hardware.h

@@ -23,6 +23,7 @@
 
 #include <types.h>
 #include <arch/object/structures.h>
+#include <machine/timer.h>
 #include <plat/machine.h>
 #include <plat/machine/hardware_gen.h>
 
@@ -65,11 +66,6 @@ void map_kernel_devices(void);
 
 void handleReservedIRQ(irq_t irq);
 
-/** MODIFIES: [*] */
-void resetTimer(void);
-/** MODIFIES: [*] */
-void initTimer(void);
-
 /* L2 cache control */
 /** MODIFIES: [*] */
 void initL2Cache(void);

include/plat/am335x/plat/machine/hardware.h

@@ -23,6 +23,7 @@
 
 #include <types.h>
 #include <arch/object/structures.h>
+#include <machine/timer.h>
 #include <plat/machine.h>
 #include <plat/machine/hardware_gen.h>
 
@@ -70,10 +71,6 @@ bool_t isIRQPending(void);
 void maskInterrupt(bool_t enable, irq_t irq);
 /** MODIFIES: */
 irq_t getActiveIRQ(void);
-/** MODIFIES: [*] */
-void resetTimer(void);
-/** MODIFIES: [*] */
-void initTimer(void);
 /* L2 cache control */
 /** MODIFIES: [*] */
 void initL2Cache(void);

include/plat/apq8064/plat/machine/hardware.h

@@ -24,6 +24,7 @@
 
 #include <types.h>
 #include <arch/object/structures.h>
+#include <machine/timer.h>
 #include <plat/machine.h>
 #include <plat/machine/hardware_gen.h>
 
@@ -68,11 +69,6 @@ void map_kernel_devices(void);
 
 void handleReservedIRQ(irq_t irq);
 
-/** MODIFIES: [*] */
-void resetTimer(void);
-/** MODIFIES: [*] */
-void initTimer(void);
-
 /** MODIFIES: [*] */
 void initL2Cache(void);
 

include/plat/exynos4/plat/machine/hardware.h

@@ -32,6 +32,7 @@
 
 #include <types.h>
 #include <arch/object/structures.h>
+#include <machine/timer.h>
 #include <plat/machine.h>
 #include <plat/machine/hardware_gen.h>
 
@@ -77,11 +78,6 @@ void map_kernel_devices(void);
 
 void handleReservedIRQ(irq_t irq);
 
-/** MODIFIES: [*] */
-void resetTimer(void);
-/** MODIFIES: [*] */
-void initTimer(void);
-
 #endif /* !__ASSEMBLER__ */
 
 #endif /* !__PLAT_MACHINE_HARDWARE_H */

include/plat/exynos5/plat/machine/hardware.h

@@ -32,6 +32,7 @@
 
 #include <types.h>
 #include <arch/object/structures.h>
+#include <machine/timer.h>
 #include <plat/machine.h>
 #include <plat/machine/hardware_gen.h>
 
@@ -76,11 +77,6 @@ void map_kernel_devices(void);
 
 void handleReservedIRQ(irq_t irq);
 
-/** MODIFIES: [*] */
-void resetTimer(void);
-/** MODIFIES: [*] */
-void initTimer(void);
-
 /** MODIFIES: [*] */
 void initL2Cache(void);
 

include/plat/hikey/plat/machine/hardware.h

@@ -23,6 +23,7 @@
 
 #include <types.h>
 #include <arch/object/structures.h>
+#include <machine/timer.h>
 #include <plat/machine.h>
 #include <plat/machine/hardware_gen.h>
 
@@ -65,11 +66,6 @@ void map_kernel_devices(void);
 
 void handleReservedIRQ(irq_t irq);
 
-/** MODIFIES: [*] */
-void resetTimer(void);
-/** MODIFIES: [*] */
-void initTimer(void);
-
 /* L2 cache control */
 /** MODIFIES: [*] */
 void initL2Cache(void);

include/plat/imx31/plat/machine/hardware.h

@@ -23,6 +23,7 @@
 
 #include <types.h>
 #include <arch/object/structures.h>
+#include <machine/timer.h>
 #include <plat/machine.h>
 #include <plat/machine/hardware_gen.h>
 #include <plat/machine/devices.h>
@@ -71,10 +72,6 @@ bool_t isIRQPending(void);
 void maskInterrupt(bool_t enable, irq_t irq);
 /** MODIFIES: */
 irq_t getActiveIRQ(void);
-/** MODIFIES: [*] */
-void resetTimer(void);
-/** MODIFIES: [*] */
-void initTimer(void);
 /* L2 cache control */
 /** MODIFIES: [*] */
 void initL2Cache(void);

include/plat/imx6/plat/machine/hardware.h

@@ -32,12 +32,12 @@
 
 #include <types.h>
 #include <arch/object/structures.h>
+#include <machine/timer.h>
 #include <plat/machine.h>
 #include <plat/machine/hardware_gen.h>
 
 #include <arch/machine/gic_pl390.h>
 #include <arch/machine/l2c_310.h>
-#include <arch/machine/priv_timer.h>
 
 static inline void * CONST
 ptrFromPAddr(paddr_t paddr)

include/plat/imx7/plat/machine/hardware.h

@@ -32,6 +32,7 @@
 
 #include <types.h>
 #include <arch/object/structures.h>
+#include <machine/timer.h>
 #include <plat/machine.h>
 #include <plat/machine/hardware_gen.h>
 
@@ -85,11 +86,6 @@ plat_invalidateL2Range(paddr_t start, paddr_t end) {}
 
 void initL2Cache(void);
 
-
-void initTimer(void);
-void resetTimer(void);
-
-
 #endif /* !__ASSEMBLER__ */
 
 #endif /* !__PLAT_MACHINE_HARDWARE_H */

include/plat/omap3/plat/machine/hardware.h

@@ -23,6 +23,7 @@
 
 #include <types.h>
 #include <arch/object/structures.h>
+#include <machine/timer.h>
 #include <plat/machine.h>
 #include <plat/machine/hardware_gen.h>
 
@@ -70,10 +71,6 @@ bool_t isIRQPending(void);
 void maskInterrupt(bool_t enable, irq_t irq);
 /** MODIFIES: */
 irq_t getActiveIRQ(void);
-/** MODIFIES: [*] */
-void resetTimer(void);
-/** MODIFIES: [*] */
-void initTimer(void);
 /* L2 cache control */
 /** MODIFIES: [*] */
 void initL2Cache(void);

include/plat/pc99/plat/machine/hardware.h

@@ -13,6 +13,7 @@
 
 #include <config.h>
 #include <types.h>
+#include <machine/timer.h>
 #include <plat/machine.h>
 #include <plat/machine/hardware_gen.h>
 
@@ -23,7 +24,6 @@ void maskInterrupt(bool_t mask, irq_t irq);
 void ackInterrupt(irq_t irq);
 irq_t getActiveIRQ(void);
 bool_t isIRQPending(void);
-void resetTimer(void);
 void platAddDevices(void);
 
 void handleSpuriousIRQ(void);

include/plat/tk1/plat/machine/hardware.h

@@ -23,6 +23,7 @@
 
 #include <types.h>
 #include <arch/object/structures.h>
+#include <machine/timer.h>
 #include <plat/machine.h>
 #include <plat/machine/hardware_gen.h>
 
@@ -65,11 +66,6 @@ void map_kernel_devices(void);
 
 void handleReservedIRQ(irq_t irq);
 
-/** MODIFIES: [*] */
-void resetTimer(void);
-/** MODIFIES: [*] */
-void initTimer(void);
-
 /* L2 cache control */
 /** MODIFIES: [*] */
 void initL2Cache(void);