imported Freescale specific U-Boot additions for i.MX28,... release L2.6.31_10.08.01

[karo-tx-uboot.git] / cpu / arm926ejs / mx27 / timer.c

diff --git a/cpu/arm926ejs/mx27/timer.c b/cpu/arm926ejs/mx27/timer.c
index 90110581ef6a73a9457efe2e84b97217cd74ca30..982c2b456c4b727df837947419f466ca3fe48fba 100644 (file)
--- a/cpu/arm926ejs/mx27/timer.c
+++ b/cpu/arm926ejs/mx27/timer.c
@@ -10,6 +10,10 @@
  * (C) Copyright 2002
  * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
  *
+ * (C) Copyright 2007
+ * Sascha Hauer, Pengutronix
+ *
+ * (C) Copyright 2008-2009 Freescale Semiconductor, Inc.
  * (C) Copyright 2009
  * Ilya Yanok, Emcraft Systems Ltd, <yanok@emcraft.com>
  *
@@ -118,7 +122,6 @@ int timer_init(void)
        writel(readl(&regs->gpt_tctl) | GPTCR_CLKSOURCE_32 | GPTCR_FRR,
                        &regs->gpt_tctl);
        writel(readl(&regs->gpt_tctl) | GPTCR_TEN, &regs->gpt_tctl);
-
        return 0;
 }