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 b97ee8d8db76913c460389f7bb56b0dd0a5c9dac..d3e6d9999852af20966aa1477dd5fbdab5d09a78 100755 (executable)
--- 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 6f83dc3ad5d223217f838f5db934e3e063bd0d8b..7e191ae11896de629767fbbdad8081c16c16b4aa 100755 (executable)
--- 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__);