From: 张晴 <zhangqing@rock-chips.com>
Date: Wed, 19 Jun 2013 02:48:19 +0000 (+0800)
Subject: pmu:modify some warning and delay time
X-Git-Tag: firefly_0821_release~6965^2~59
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=41f9dc90bec06c11772e3f2e052a66bc8195ca99;p=firefly-linux-kernel-4.4.55.git

pmu:modify some warning and delay time
---

diff --git a/arch/arm/mach-rk30/board-pmu-act8846.c b/arch/arm/mach-rk30/board-pmu-act8846.c
index b97ee8d8db76..d3e6d9999852 100755
--- a/arch/arm/mach-rk30/board-pmu-act8846.c
+++ b/arch/arm/mach-rk30/board-pmu-act8846.c
@@ -517,14 +517,17 @@ void __sramfunc board_pmu_act8846_resume(void)
 void __sramfunc board_act8846_set_suspend_vol(void)
 {	
 #ifdef CONFIG_ACT8846_SUPPORT_RESET
+	if(pmic_is_act8846()){
 	sram_gpio_set_value(pmic_vsel, GPIO_HIGH); 
+	}
 #endif
 }
 void __sramfunc board_act8846_set_resume_vol(void)
 {
 #ifdef CONFIG_ACT8846_SUPPORT_RESET
+	if(pmic_is_act8846()){
 	sram_gpio_set_value(pmic_vsel, GPIO_LOW);  
-	sram_32k_udelay(10000);
+	}
 #endif
 }
 
diff --git a/arch/arm/mach-rk30/board-pmu-tps65910.c b/arch/arm/mach-rk30/board-pmu-tps65910.c
index 6f83dc3ad5d2..7e191ae11896 100755
--- a/arch/arm/mach-rk30/board-pmu-tps65910.c
+++ b/arch/arm/mach-rk30/board-pmu-tps65910.c
@@ -14,7 +14,6 @@ extern int platform_device_register(struct platform_device *pdev);
 int tps65910_pre_init(struct tps65910 *tps65910){
 
 	int val = 0;
-	int i 	= 0;
 	int err = -1;
 		
 	printk("%s,line=%d\n", __func__,__LINE__);