From: Minkyu Kang Date: Thu, 19 Aug 2010 04:36:07 +0000 (+0900) Subject: s5p: rename s5pc1xx to s5p X-Git-Tag: JH02_20100820~68 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=efb91885856c2c3116eb7a85e35966880bc3474c;p=kernel%2Fu-boot.git s5p: rename s5pc1xx to s5p Signed-off-by: Minkyu Kang --- diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c index b402ec9..ba231e4 100644 --- a/arch/arm/cpu/armv7/s5p-common/timer.c +++ b/arch/arm/cpu/armv7/s5p-common/timer.c @@ -44,14 +44,14 @@ static unsigned long long timestamp; /* Monotonic incrementing timer */ static unsigned long lastdec; /* Last decremneter snapshot */ /* macro to read the 16 bit timer */ -static inline struct s5p_timer *s5pc1xx_get_base_timer(void) +static inline struct s5p_timer *s5p_get_base_timer(void) { return (struct s5p_timer *)samsung_get_base_timer(); } int timer_init(void) { - struct s5p_timer *const timer = s5pc1xx_get_base_timer(); + struct s5p_timer *const timer = s5p_get_base_timer(); u32 val; /* @@ -162,7 +162,7 @@ void __udelay(unsigned long usec) void reset_timer_masked(void) { - struct s5p_timer *const timer = s5pc1xx_get_base_timer(); + struct s5p_timer *const timer = s5p_get_base_timer(); /* reset time */ lastdec = readl(&timer->tcnto4); @@ -171,7 +171,7 @@ void reset_timer_masked(void) unsigned long get_timer_masked(void) { - struct s5p_timer *const timer = s5pc1xx_get_base_timer(); + struct s5p_timer *const timer = s5p_get_base_timer(); unsigned long now = readl(&timer->tcnto4); if (lastdec >= now)