Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / arch / arm / cpu / armv7 / s5p-common / timer.c

diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c
index 6487c0f3a3098bf6e67bca7d8927b8d19ad0be69..b750d161417bb891a641aee19afceb4dec078e2a 100644 (file)
--- a/arch/arm/cpu/armv7/s5p-common/timer.c
+++ b/arch/arm/cpu/armv7/s5p-common/timer.c
@@ -27,68 +27,22 @@
 #include <asm/io.h>
 #include <asm/arch/pwm.h>
 #include <asm/arch/clk.h>
+#include <pwm.h>
 
-#define PRESCALER_1            (16 - 1)        /* prescaler of timer 2, 3, 4 */
-#define MUX_DIV_2              1               /* 1/2 period */
-#define MUX_DIV_4              2               /* 1/4 period */
-#define MUX_DIV_8              3               /* 1/8 period */
-#define MUX_DIV_16             4               /* 1/16 period */
-#define MUX4_DIV_SHIFT         16
-
-#define TCON_TIMER4_SHIFT      20
-
-static unsigned long count_value;
-
-/* Internal tick units */
-static unsigned long long timestamp;   /* Monotonic incrementing timer */
-static unsigned long lastdec;          /* Last decremneter snapshot */
+DECLARE_GLOBAL_DATA_PTR;
 
 /* macro to read the 16 bit timer */
-static inline struct s5pc1xx_timer *s5pc1xx_get_base_timer(void)
+static inline struct s5p_timer *s5p_get_base_timer(void)
 {
-       return (struct s5pc1xx_timer *)samsung_get_base_timer();
+       return (struct s5p_timer *)samsung_get_base_timer();
 }
 
 int timer_init(void)
 {
-       struct s5pc1xx_timer *const timer = s5pc1xx_get_base_timer();
-       u32 val;
-
-       /*
-        * @ PWM Timer 4
-        * Timer Freq(HZ) =
-        *      PCLK / { (prescaler_value + 1) * (divider_value) }
-        */
-
-       /* set prescaler : 16 */
-       /* set divider : 2 */
-       writel((PRESCALER_1 & 0xff) << 8, &timer->tcfg0);
-       writel((MUX_DIV_2 & 0xf) << MUX4_DIV_SHIFT, &timer->tcfg1);
-
-       if (count_value == 0) {
-               /* reset initial value */
-               /* count_value = 2085937.5(HZ) (per 1 sec)*/
-               count_value = get_pclk() / ((PRESCALER_1 + 1) *
-                               (MUX_DIV_2 + 1));
-
-               /* count_value / 100 = 20859.375(HZ) (per 10 msec) */
-               count_value = count_value / 100;
-       }
-
-       /* set count value */
-       writel(count_value, &timer->tcntb4);
-       lastdec = count_value;
-
-       val = (readl(&timer->tcon) & ~(0x07 << TCON_TIMER4_SHIFT)) |
-               S5PC1XX_TCON4_AUTO_RELOAD;
-
-       /* auto reload & manual update */
-       writel(val | S5PC1XX_TCON4_UPDATE, &timer->tcon);
-
-       /* start PWM timer 4 */
-       writel(val | S5PC1XX_TCON4_START, &timer->tcon);
-
-       timestamp = 0;
+       /* PWM Timer 4 */
+       pwm_init(4, MUX_DIV_2, 0);
+       pwm_config(4, 0, 0);
+       pwm_enable(4);
 
        return 0;
 }
@@ -108,13 +62,16 @@ unsigned long get_timer(unsigned long base)
 
 void set_timer(unsigned long t)
 {
-       timestamp = t;
+       gd->tbl = t;
 }
 
 /* delay x useconds */
 void __udelay(unsigned long usec)
 {
-       unsigned long tmo, tmp;
+       struct s5p_timer *const timer = s5p_get_base_timer();
+       unsigned long tmo, tmp, count_value;
+
+       count_value = readl(&timer->tcntb4);
 
        if (usec >= 1000) {
                /*
@@ -137,7 +94,7 @@ void __udelay(unsigned long usec)
        tmp = get_timer(0);
 
        /* if setting this fordward will roll time stamp */
-       /* reset "advancing" timestamp to 0, set lastdec value */
+       /* reset "advancing" timestamp to 0, set lastinc value */
        /* else, set advancing stamp wake up time */
        if ((tmo + tmp + 1) < tmp)
                reset_timer_masked();
@@ -151,26 +108,27 @@ void __udelay(unsigned long usec)
 
 void reset_timer_masked(void)
 {
-       struct s5pc1xx_timer *const timer = s5pc1xx_get_base_timer();
+       struct s5p_timer *const timer = s5p_get_base_timer();
 
        /* reset time */
-       lastdec = readl(&timer->tcnto4);
-       timestamp = 0;
+       gd->lastinc = readl(&timer->tcnto4);
+       gd->tbl = 0;
 }
 
 unsigned long get_timer_masked(void)
 {
-       struct s5pc1xx_timer *const timer = s5pc1xx_get_base_timer();
+       struct s5p_timer *const timer = s5p_get_base_timer();
        unsigned long now = readl(&timer->tcnto4);
+       unsigned long count_value = readl(&timer->tcntb4);
 
-       if (lastdec >= now)
-               timestamp += lastdec - now;
+       if (gd->lastinc >= now)
+               gd->tbl += gd->lastinc - now;
        else
-               timestamp += lastdec + count_value - now;
+               gd->tbl += gd->lastinc + count_value - now;
 
-       lastdec = now;
+       gd->lastinc = now;
 
-       return timestamp;
+       return gd->tbl;
 }
 
 /*