From: 张晴 <zhangqing@rock-chips.com>
Date: Wed, 1 Aug 2012 09:41:38 +0000 (+0800)
Subject: rk30:modify suspend func for 8326 and tps65910
X-Git-Tag: firefly_0821_release~8937
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7ab463de1ea6ee0d6a3128709108f94bdecd9c7a;p=firefly-linux-kernel-4.4.55.git

rk30:modify suspend func for 8326 and tps65910
---

diff --git a/arch/arm/mach-rk30/board-rk30-phonepad.c b/arch/arm/mach-rk30/board-rk30-phonepad.c
index 7680d9e6576d..9ef6f09f2ad1 100755
--- a/arch/arm/mach-rk30/board-rk30-phonepad.c
+++ b/arch/arm/mach-rk30/board-rk30-phonepad.c
@@ -1835,19 +1835,26 @@ static struct i2c_board_info __initdata i2c1_info[] = {
 
 void __sramfunc board_pmu_suspend(void)
 {      
+	#if defined (CONFIG_MFD_WM831X_I2C)
        if(g_pmic_type == PMIC_TYPE_WM8326)
        board_pmu_wm8326_suspend();
-       else if(g_pmic_type == PMIC_TYPE_TPS65910)
+	#endif
+	#if defined (CONFIG_MFD_TPS65910)
+       if(g_pmic_type == PMIC_TYPE_TPS65910)
        board_pmu_tps65910_suspend(); 
-       
+    #endif   
 }
 
 void __sramfunc board_pmu_resume(void)
 {      
+	#if defined (CONFIG_MFD_WM831X_I2C)
        if(g_pmic_type == PMIC_TYPE_WM8326)
        board_pmu_wm8326_resume();
-       else if(g_pmic_type == PMIC_TYPE_TPS65910)
-       board_pmu_tps65910_resume();      
+	#endif
+	#if defined (CONFIG_MFD_TPS65910)
+       if(g_pmic_type == PMIC_TYPE_TPS65910)
+       board_pmu_tps65910_resume(); 
+	#endif
 }
 
 
diff --git a/arch/arm/mach-rk30/board-rk30-sdk.c b/arch/arm/mach-rk30/board-rk30-sdk.c
index 1eaec78a1308..4865314c883f 100755
--- a/arch/arm/mach-rk30/board-rk30-sdk.c
+++ b/arch/arm/mach-rk30/board-rk30-sdk.c
@@ -1572,22 +1572,28 @@ static struct i2c_board_info __initdata i2c1_info[] = {
 };
 #endif
 
-
 void __sramfunc board_pmu_suspend(void)
 {      
+	#if defined (CONFIG_MFD_WM831X_I2C)
        if(g_pmic_type == PMIC_TYPE_WM8326)
        board_pmu_wm8326_suspend();
-       else if(g_pmic_type == PMIC_TYPE_TPS65910)
+	#endif
+	#if defined (CONFIG_MFD_TPS65910)
+       if(g_pmic_type == PMIC_TYPE_TPS65910)
        board_pmu_tps65910_suspend(); 
-       
+    #endif   
 }
 
 void __sramfunc board_pmu_resume(void)
 {      
+	#if defined (CONFIG_MFD_WM831X_I2C)
        if(g_pmic_type == PMIC_TYPE_WM8326)
        board_pmu_wm8326_resume();
-       else if(g_pmic_type == PMIC_TYPE_TPS65910)
-       board_pmu_tps65910_resume();      
+	#endif
+	#if defined (CONFIG_MFD_TPS65910)
+       if(g_pmic_type == PMIC_TYPE_TPS65910)
+       board_pmu_tps65910_resume(); 
+	#endif
 }
 
 #ifdef CONFIG_I2C2_RK30