From: 许盛飞 <xsf@rock-chips.com>
Date: Tue, 7 May 2013 08:42:36 +0000 (+0800)
Subject: charging-displasy: when mode_normal and mode_charge
X-Git-Tag: firefly_0821_release~7142
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=33dee0532c7652d6759949f562857733f13b8de6;p=firefly-linux-kernel-4.4.55.git

charging-displasy: when mode_normal and mode_charge
---

diff --git a/drivers/power/rk29_charger_display.c b/drivers/power/rk29_charger_display.c
index 7d2253b29800..f384a9745dea 100755
--- a/drivers/power/rk29_charger_display.c
+++ b/drivers/power/rk29_charger_display.c
@@ -166,7 +166,7 @@ static int  __init start_charge_logo_display(void)
 
 	if(val_status.intval == POWER_SUPPLY_STATUS_CHARGING)
 	{
-		if ((board_boot_mode() != BOOT_MODE_REBOOT) || (val_capacity.intval <= pwr_on_thrsd))  //do not enter power on charge mode when soft  reset
+		if ((board_boot_mode() == BOOT_MODE_NORMAL) ||(board_boot_mode() == BOOT_MODE_CHARGE)|| (val_capacity.intval <= pwr_on_thrsd))  //do not enter power on charge mode when soft  reset
 	    {			
 			add_bootmode_charger_to_cmdline();
 			//boot_mode_init("charge");