rk29_backlight: use new pwm API

diff --git a/drivers/video/backlight/rk2818_backlight.h b/drivers/video/backlight/rk2818_backlight.h
deleted file mode 100644 (file)
index 0ce4039..0000000
--- a/drivers/video/backlight/rk2818_backlight.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *  drivers/video/rk29_backlight.h
- *
- */
-
-#ifndef __ASM_ARCH_RK2818_BACKLIGHT_H
-#define __ASM_ARCH_RK2818_BACKLIGHT_H
-
-///PWM_CTRL
-#define PWM_DIV2            (0<<9)
-#define PWM_DIV4            (1<<9)
-#define PWM_DIV8            (2<<9)
-#define PWM_DIV16           (3<<9)
-#define PWM_DIV32           (4<<9)
-#define PWM_DIV64           (5<<9)
-#define PWM_DIV128          (6<<9)
-#define PWM_DIV256          (7<<9)
-#define PWM_DIV512          (8<<9)
-#define PWM_DIV1024         (9<<9)
-
-#define PWM_CAPTURE         (1<<8)
-#define PWM_RESET           (1<<7)
-#define PWM_INTCLR          (1<<6)
-#define PWM_INTEN           (1<<5)
-#define PWM_SINGLE          (1<<6)
-
-#define PWM_ENABLE          (1<<3)
-#define PWM_TIME_EN         (1)
-
-
-#define PWM_REG_CNTR         0x00
-#define PWM_REG_HRC          0x04 
-#define PWM_REG_LRC          0x08
-#define PWM_REG_CTRL         0x0c
-
-
-#define PWM_DIV              PWM_DIV2
-#define PWM_APB_PRE_DIV      1000
-#define BL_STEP              255
-
-#endif /* __ASM_ARCH_RK2818_BACKLIGHT_H */

diff --git a/drivers/video/backlight/rk29_backlight.c b/drivers/video/backlight/rk29_backlight.c
index 7989b0b5f325250c7703837ca4cad6269e5c7477..7f2fa1640cb3c1b1811d9d5021f4a9e9a21c0468 100755 (executable)
--- a/drivers/video/backlight/rk29_backlight.c
+++ b/drivers/video/backlight/rk29_backlight.c
@@ -26,8 +26,11 @@
 #include <linux/earlysuspend.h>
 #include <asm/io.h>
 #include <mach/board.h>
+#include <plat/pwm.h>
 
-#include "rk2818_backlight.h"
+#define PWM_DIV              PWM_DIV2
+#define PWM_APB_PRE_DIV      1000
+#define BL_STEP              255
 
 /*
  * Debug
@@ -38,20 +41,10 @@
 #define DBG(x...)
 #endif
 
-#if defined(CONFIG_ARCH_RK30)
-#define write_pwm_reg(id, addr, val)        __raw_writel(val, addr+(RK30_PWM01_BASE+(id>>1)*0x20000)+id*0x10)
-#define read_pwm_reg(id, addr)              __raw_readl(addr+(RK30_PWM01_BASE+(id>>1)*0x20000+id*0x10))
-
-#elif defined(CONFIG_ARCH_RK2928)
-#define write_pwm_reg(id, addr, val)        __raw_writel(val, addr+(RK2928_PWM_BASE+id*0x10))
-#define read_pwm_reg(id, addr)              __raw_readl(addr+(RK2928_PWM_BASE+id*0x10))
-
-#elif defined(CONFIG_ARCH_RK29)
-#define write_pwm_reg(id, addr, val)        __raw_writel(val, addr+(RK29_PWM_BASE+id*0x10))
-#define read_pwm_reg(id, addr)              __raw_readl(addr+(RK29_PWM_BASE+id*0x10))    
-#endif
+#define read_pwm_reg(addr)              __raw_readl(pwm_base + addr)
 
 static struct clk *pwm_clk;
+static void __iomem *pwm_base;
 static struct backlight_device *rk29_bl;
 static int suspend_flag = 0;
 
@@ -144,13 +137,13 @@ static int rk29_bl_update_status(struct backlight_device *bl)
                msleep(1);
        }
 
-       div_total = read_pwm_reg(id, PWM_REG_LRC);
+       div_total = read_pwm_reg(PWM_REG_LRC);
        if (ref) {
                divh = div_total*brightness/BL_STEP;
        } else {
                divh = div_total*(BL_STEP-brightness)/BL_STEP;
        }
-       write_pwm_reg(id, PWM_REG_HRC, divh);
+       rk_pwm_setup(id, PWM_DIV, divh, div_total);
 
        DBG("%s:line=%d,brightness = %d, div_total = %d, divh = %d state=%x \n",__FUNCTION__,__LINE__,brightness, div_total, divh,bl->props.state);
 out:
@@ -162,11 +155,10 @@ static int rk29_bl_get_brightness(struct backlight_device *bl)
 {
        u32 divh,div_total;
        struct rk29_bl_info *rk29_bl_info = bl_get_data(bl);
-       u32 id = rk29_bl_info->pwm_id;
        u32 ref = rk29_bl_info->bl_ref;
 
-       div_total = read_pwm_reg(id, PWM_REG_LRC);
-       divh = read_pwm_reg(id, PWM_REG_HRC);
+       div_total = read_pwm_reg(PWM_REG_LRC);
+       divh = read_pwm_reg(PWM_REG_HRC);
 
        if (!div_total)
                return 0;
@@ -281,14 +273,8 @@ static int rk29_backlight_probe(struct platform_device *pdev)
                return -ENODEV;         
        }
 
-#if defined(CONFIG_ARCH_RK29)
-       pwm_clk = clk_get(NULL, "pwm");
-#elif defined(CONFIG_ARCH_RK30) || defined(CONFIG_ARCH_RK2928)
-       if (id == 0 || id == 1)
-               pwm_clk = clk_get(NULL, "pwm01");
-       else if (id == 2 || id == 3)
-               pwm_clk = clk_get(NULL, "pwm23");
-#endif
+       pwm_base = rk_pwm_get_base(id);
+       pwm_clk = rk_pwm_get_clk(id);
        if (IS_ERR(pwm_clk) || !pwm_clk) {
                printk(KERN_ERR "failed to get pwm clock source\n");
                return -ENODEV;
@@ -306,11 +292,7 @@ static int rk29_backlight_probe(struct platform_device *pdev)
        }
 
        clk_enable(pwm_clk);
-       write_pwm_reg(id, PWM_REG_CTRL, PWM_DIV|PWM_RESET);
-       write_pwm_reg(id, PWM_REG_LRC, div_total);
-       write_pwm_reg(id, PWM_REG_HRC, divh);
-       write_pwm_reg(id, PWM_REG_CNTR, 0x0);
-       write_pwm_reg(id, PWM_REG_CTRL, PWM_DIV|PWM_ENABLE|PWM_TIME_EN);
+       rk_pwm_setup(id, PWM_DIV, divh, div_total);
 
        rk29_bl->props.power = FB_BLANK_UNBLANK;
        rk29_bl->props.fb_blank = FB_BLANK_UNBLANK;