Merge branch 'drm-intel-next' of git://people.freedesktop.org/~danvet/drm-intel into...

[karo-tx-linux.git] / arch / arm / include / asm / smp_twd.h

diff --git a/arch/arm/include/asm/smp_twd.h b/arch/arm/include/asm/smp_twd.h
index ef9ffba97ad8d7633a830349d72da8b189e5bda8..0f01f4677bd27569df340029cabe9f602a1e0eeb 100644 (file)
--- a/arch/arm/include/asm/smp_twd.h
+++ b/arch/arm/include/asm/smp_twd.h
@@ -18,11 +18,28 @@
 #define TWD_TIMER_CONTROL_PERIODIC     (1 << 1)
 #define TWD_TIMER_CONTROL_IT_ENABLE    (1 << 2)
 
-struct clock_event_device;
+#include <linux/ioport.h>
 
-extern void __iomem *twd_base;
+struct twd_local_timer {
+       struct resource res[2];
+};
 
-void twd_timer_setup(struct clock_event_device *);
-void twd_timer_stop(struct clock_event_device *);
+#define DEFINE_TWD_LOCAL_TIMER(name,base,irq)  \
+struct twd_local_timer name __initdata = {     \
+       .res    = {                             \
+               DEFINE_RES_MEM(base, 0x10),     \
+               DEFINE_RES_IRQ(irq),            \
+       },                                      \
+};
+
+int twd_local_timer_register(struct twd_local_timer *);
+
+#ifdef CONFIG_HAVE_ARM_TWD
+void twd_local_timer_of_register(void);
+#else
+static inline void twd_local_timer_of_register(void)
+{
+}
+#endif
 
 #endif