From: Trilok Soni <[EMAIL PROTECTED]>
Signed-off-by: Trilok Soni <[EMAIL PROTECTED]>
---
arch/arm/mach-davinci/time.c | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c
index e96a3dc..5c3f7c5 100644
--- a/arch/arm/mach-davinci/time.c
+++ b/arch/arm/mach-davinci/time.c
@@ -15,14 +15,14 @@
#include <linux/clocksource.h>
#include <linux/clockchips.h>
#include <linux/spinlock.h>
+#include <linux/io.h>
+#include <linux/errno.h>
+#include <linux/irq.h>
-#include <asm/io.h>
#include <asm/hardware.h>
#include <asm/system.h>
-#include <asm/irq.h>
#include <asm/mach/irq.h>
#include <asm/mach/time.h>
-#include <asm/errno.h>
#include <asm/arch/io.h>
static struct clock_event_device clockevent_davinci;
@@ -180,7 +180,7 @@ static void __init timer_init(void)
int i;
/* Global init of each 64-bit timer as a whole */
- for(i=0; i<2; i++) {
+ for (i = 0; i < 2; i++) {
u32 tgcr, base = bases[i];
/* Disabled, Internal clock source */
@@ -205,7 +205,7 @@ static void __init timer_init(void)
}
/* Init of each timer as a 32-bit timer */
- for (i=0; i< ARRAY_SIZE(timers); i++) {
+ for (i = 0; i < ARRAY_SIZE(timers); i++) {
struct timer_s *t = &timers[i];
if (t->name) {
@@ -226,9 +226,8 @@ static void __init timer_init(void)
/* Register interrupt */
t->irqaction.name = t->name;
t->irqaction.dev_id = (void *)t;
- if (t->irqaction.handler != NULL) {
+ if (t->irqaction.handler != NULL)
setup_irq(timer_irqs[t->id], &t->irqaction);
- }
timer32_config(&timers[i]);
}
@@ -330,9 +329,9 @@ struct sys_timer davinci_timer = {
.init = davinci_timer_init,
};
-
/* reset board using watchdog timer */
-void davinci_watchdog_reset(void) {
+void davinci_watchdog_reset(void)
+{
u32 tgcr, wdtcr, base = DAVINCI_WDOG_BASE;
/* disable, internal clock source */
--
1.5.5
_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
