* [PATCH 1/2] ARM TWD: move TWD registers to common header
@ 2010-05-07 4:41 srinidhi kasagar
2010-05-07 4:44 ` srinidhi
0 siblings, 1 reply; 2+ messages in thread
From: srinidhi kasagar @ 2010-05-07 4:41 UTC (permalink / raw)
To: linux-arm-kernel
This moves the TWD register set of MPcore to a common
existing file so that watchdog driver can access it
Signed-off-by: srinidhi kasagar <srinidhi.kasagar@stericsson.com>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
---
arch/arm/include/asm/smp_twd.h | 17 +++++++++++++++++
arch/arm/kernel/smp_twd.c | 17 -----------------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/arch/arm/include/asm/smp_twd.h b/arch/arm/include/asm/smp_twd.h
index 7be0978..634f357 100644
--- a/arch/arm/include/asm/smp_twd.h
+++ b/arch/arm/include/asm/smp_twd.h
@@ -1,6 +1,23 @@
#ifndef __ASMARM_SMP_TWD_H
#define __ASMARM_SMP_TWD_H
+#define TWD_TIMER_LOAD 0x00
+#define TWD_TIMER_COUNTER 0x04
+#define TWD_TIMER_CONTROL 0x08
+#define TWD_TIMER_INTSTAT 0x0C
+
+#define TWD_WDOG_LOAD 0x20
+#define TWD_WDOG_COUNTER 0x24
+#define TWD_WDOG_CONTROL 0x28
+#define TWD_WDOG_INTSTAT 0x2C
+#define TWD_WDOG_RESETSTAT 0x30
+#define TWD_WDOG_DISABLE 0x34
+
+#define TWD_TIMER_CONTROL_ENABLE (1 << 0)
+#define TWD_TIMER_CONTROL_ONESHOT (0 << 1)
+#define TWD_TIMER_CONTROL_PERIODIC (1 << 1)
+#define TWD_TIMER_CONTROL_IT_ENABLE (1 << 2)
+
struct clock_event_device;
extern void __iomem *twd_base;
diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
index ea02a7b..7c5f0c0 100644
--- a/arch/arm/kernel/smp_twd.c
+++ b/arch/arm/kernel/smp_twd.c
@@ -21,23 +21,6 @@
#include <asm/smp_twd.h>
#include <asm/hardware/gic.h>
-#define TWD_TIMER_LOAD 0x00
-#define TWD_TIMER_COUNTER 0x04
-#define TWD_TIMER_CONTROL 0x08
-#define TWD_TIMER_INTSTAT 0x0C
-
-#define TWD_WDOG_LOAD 0x20
-#define TWD_WDOG_COUNTER 0x24
-#define TWD_WDOG_CONTROL 0x28
-#define TWD_WDOG_INTSTAT 0x2C
-#define TWD_WDOG_RESETSTAT 0x30
-#define TWD_WDOG_DISABLE 0x34
-
-#define TWD_TIMER_CONTROL_ENABLE (1 << 0)
-#define TWD_TIMER_CONTROL_ONESHOT (0 << 1)
-#define TWD_TIMER_CONTROL_PERIODIC (1 << 1)
-#define TWD_TIMER_CONTROL_IT_ENABLE (1 << 2)
-
/* set up by the platform code */
void __iomem *twd_base;
--
1.7.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 1/2] ARM TWD: move TWD registers to common header
2010-05-07 4:41 [PATCH 1/2] ARM TWD: move TWD registers to common header srinidhi kasagar
@ 2010-05-07 4:44 ` srinidhi
0 siblings, 0 replies; 2+ messages in thread
From: srinidhi @ 2010-05-07 4:44 UTC (permalink / raw)
To: linux-arm-kernel
Copying Wim Van Sebroeck
Srinidhi
On Fri, 2010-05-07 at 06:41 +0200, Srinidhi KASAGAR wrote:
> This moves the TWD register set of MPcore to a common
> existing file so that watchdog driver can access it
>
> Signed-off-by: srinidhi kasagar <srinidhi.kasagar@stericsson.com>
> Acked-by: Linus Walleij <linus.walleij@stericsson.com>
> ---
> arch/arm/include/asm/smp_twd.h | 17 +++++++++++++++++
> arch/arm/kernel/smp_twd.c | 17 -----------------
> 2 files changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/arch/arm/include/asm/smp_twd.h b/arch/arm/include/asm/smp_twd.h
> index 7be0978..634f357 100644
> --- a/arch/arm/include/asm/smp_twd.h
> +++ b/arch/arm/include/asm/smp_twd.h
> @@ -1,6 +1,23 @@
> #ifndef __ASMARM_SMP_TWD_H
> #define __ASMARM_SMP_TWD_H
>
> +#define TWD_TIMER_LOAD 0x00
> +#define TWD_TIMER_COUNTER 0x04
> +#define TWD_TIMER_CONTROL 0x08
> +#define TWD_TIMER_INTSTAT 0x0C
> +
> +#define TWD_WDOG_LOAD 0x20
> +#define TWD_WDOG_COUNTER 0x24
> +#define TWD_WDOG_CONTROL 0x28
> +#define TWD_WDOG_INTSTAT 0x2C
> +#define TWD_WDOG_RESETSTAT 0x30
> +#define TWD_WDOG_DISABLE 0x34
> +
> +#define TWD_TIMER_CONTROL_ENABLE (1 << 0)
> +#define TWD_TIMER_CONTROL_ONESHOT (0 << 1)
> +#define TWD_TIMER_CONTROL_PERIODIC (1 << 1)
> +#define TWD_TIMER_CONTROL_IT_ENABLE (1 << 2)
> +
> struct clock_event_device;
>
> extern void __iomem *twd_base;
> diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
> index ea02a7b..7c5f0c0 100644
> --- a/arch/arm/kernel/smp_twd.c
> +++ b/arch/arm/kernel/smp_twd.c
> @@ -21,23 +21,6 @@
> #include <asm/smp_twd.h>
> #include <asm/hardware/gic.h>
>
> -#define TWD_TIMER_LOAD 0x00
> -#define TWD_TIMER_COUNTER 0x04
> -#define TWD_TIMER_CONTROL 0x08
> -#define TWD_TIMER_INTSTAT 0x0C
> -
> -#define TWD_WDOG_LOAD 0x20
> -#define TWD_WDOG_COUNTER 0x24
> -#define TWD_WDOG_CONTROL 0x28
> -#define TWD_WDOG_INTSTAT 0x2C
> -#define TWD_WDOG_RESETSTAT 0x30
> -#define TWD_WDOG_DISABLE 0x34
> -
> -#define TWD_TIMER_CONTROL_ENABLE (1 << 0)
> -#define TWD_TIMER_CONTROL_ONESHOT (0 << 1)
> -#define TWD_TIMER_CONTROL_PERIODIC (1 << 1)
> -#define TWD_TIMER_CONTROL_IT_ENABLE (1 << 2)
> -
> /* set up by the platform code */
> void __iomem *twd_base;
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-05-07 4:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-07 4:41 [PATCH 1/2] ARM TWD: move TWD registers to common header srinidhi kasagar
2010-05-07 4:44 ` srinidhi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox