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 7680d9e6576dde9fbfe4abfd4e0c2b0def9f0ab4..9ef6f09f2ad179e1c0076f4f8abf7796da77bed2 100755 (executable)
--- 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 1eaec78a130872a2c4972478ee791561a38e37da..4865314c883f455211f3c5d2e740505b5b28fcb3 100755 (executable)
--- 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