rk29: remove board aigo

[firefly-linux-kernel-4.4.55.git] / drivers / video / backlight / rk29_backlight.c

diff --git a/drivers/video/backlight/rk29_backlight.c b/drivers/video/backlight/rk29_backlight.c
old mode 100644 (file)
new mode 100755 (executable)
index ecb362e..8643fc3
--- a/drivers/video/backlight/rk29_backlight.c
+++ b/drivers/video/backlight/rk29_backlight.c
@@ -67,11 +67,7 @@ static s32 rk29_bl_update_status(struct backlight_device *bl)
     
     div_total = read_pwm_reg(id, PWM_REG_LRC);
     if (ref) {
-       #if defined(CONFIG_MACH_RK29_AIGO)
-        divh = div_total*(BL_STEP - bl->props.brightness)/BL_STEP;
-       #else
         divh = div_total*(bl->props.brightness)/BL_STEP;
-       #endif
         DBG(">>>%s-->%d   bl->props.brightness == %d, div_total == %d , divh == %d\n",__FUNCTION__,__LINE__,bl->props.brightness, div_total, divh);
     } else {
         DBG(">>>%s-->%d   bl->props.brightness == %d\n",__FUNCTION__,__LINE__,bl->props.brightness);
@@ -164,6 +160,10 @@ static void rk29_delaybacklight_timer(unsigned long data)
        struct rk29_bl_info *rk29_bl_info = (struct rk29_bl_info *)data;
        u32 id, brightness;
        u32 div_total, divh;
+
+       if (rk29_bl_info->pwm_resume)
+               rk29_bl_info->pwm_resume();
+               
        clk_enable(pwm_clk);
        id = rk29_bl_info->pwm_id;
     brightness = rk29_bl->props.brightness;
@@ -197,10 +197,14 @@ static void rk29_bl_suspend(struct early_suspend *h)
     }
 
     write_pwm_reg(id, PWM_REG_HRC, divh);
-       if (!suspend_flag)
+       if (!suspend_flag) {
                clk_disable(pwm_clk);
-
+               if (rk29_bl_info->pwm_suspend)
+                       rk29_bl_info->pwm_suspend();
+       }
+       
     suspend_flag = 1;
+    del_timer_sync(&rk29_bl_info->timer);
 }
 
 
@@ -388,4 +392,4 @@ static int __init rk29_backlight_init(void)
        platform_driver_register(&rk29_backlight_driver);
        return 0;
 }
-postcore_initcall_sync(rk29_backlight_init);
+fs_initcall_sync(rk29_backlight_init);