s5p: pwm: rename s5pc1xx to s5p

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/arch/arm/cpu/armv7/s5pc1xx/timer.c b/arch/arm/cpu/armv7/s5pc1xx/timer.c
index a51b642..b402ec9 100644 (file)
--- a/arch/arm/cpu/armv7/s5pc1xx/timer.c
+++ b/arch/arm/cpu/armv7/s5pc1xx/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 s5pc1xx_timer *s5pc1xx_get_base_timer(void)
+static inline struct s5p_timer *s5pc1xx_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();
+       struct s5p_timer *const timer = s5pc1xx_get_base_timer();
        u32 val;
 
        /*
@@ -86,13 +86,13 @@ int timer_init(void)
        lastdec = count_value;
 
        val = (readl(&timer->tcon) & ~(0x07 << TCON_TIMER4_SHIFT)) |
-               S5PC1XX_TCON4_AUTO_RELOAD;
+               TCON4_AUTO_RELOAD;
 
        /* auto reload & manual update */
-       writel(val | S5PC1XX_TCON4_UPDATE, &timer->tcon);
+       writel(val | TCON4_UPDATE, &timer->tcon);
 
        /* start PWM timer 4 */
-       writel(val | S5PC1XX_TCON4_START, &timer->tcon);
+       writel(val | TCON4_START, &timer->tcon);
 
        timestamp = 0;
 
@@ -162,7 +162,7 @@ void __udelay(unsigned long usec)
 
 void reset_timer_masked(void)
 {
-       struct s5pc1xx_timer *const timer = s5pc1xx_get_base_timer();
+       struct s5p_timer *const timer = s5pc1xx_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 s5pc1xx_timer *const timer = s5pc1xx_get_base_timer();
+       struct s5p_timer *const timer = s5pc1xx_get_base_timer();
        unsigned long now = readl(&timer->tcnto4);
 
        if (lastdec >= now)

diff --git a/arch/arm/include/asm/arch-s5pc1xx/pwm.h b/arch/arm/include/asm/arch-s5pc1xx/pwm.h
index 518f6ae..0369968 100644 (file)
--- a/arch/arm/include/asm/arch-s5pc1xx/pwm.h
+++ b/arch/arm/include/asm/arch-s5pc1xx/pwm.h
@@ -23,14 +23,14 @@
 #define __ASM_ARM_ARCH_PWM_H_
 
 /* Interval mode(Auto Reload) of PWM Timer 4 */
-#define S5PC1XX_TCON4_AUTO_RELOAD      (1 << 22)
+#define TCON4_AUTO_RELOAD      (1 << 22)
 /* Update TCNTB4 */
-#define S5PC1XX_TCON4_UPDATE           (1 << 21)
+#define TCON4_UPDATE           (1 << 21)
 /* start bit of PWM Timer 4 */
-#define S5PC1XX_TCON4_START            (1 << 20)
+#define TCON4_START            (1 << 20)
 
 #ifndef __ASSEMBLY__
-struct s5pc1xx_timer {
+struct s5p_timer {
        unsigned int    tcfg0;
        unsigned int    tcfg1;
        unsigned int    tcon;