From: 张晴 <zhangqing@rock-chips.com>
Date: Thu, 11 Oct 2012 10:09:10 +0000 (+0800)
Subject: rk2926:compat pmu sleep and resume for act8931 and tps65910
X-Git-Tag: firefly_0821_release~8437
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fd56368deea57767329744849cfec9e3ad2bc520;p=firefly-linux-kernel-4.4.55.git

rk2926:compat pmu sleep and resume for act8931 and tps65910
---

diff --git a/arch/arm/mach-rk2928/board-rk2928-a720-tps65910.c b/arch/arm/mach-rk2928/board-rk2928-a720-tps65910.c
index 67273cee028c..3433f6ced0dd 100755
--- a/arch/arm/mach-rk2928/board-rk2928-a720-tps65910.c
+++ b/arch/arm/mach-rk2928/board-rk2928-a720-tps65910.c
@@ -574,7 +574,7 @@ static struct regulator_init_data tps65910_ldo8 = {
 	.num_consumer_supplies = ARRAY_SIZE(tps65910_ldo8_supply),
 	.consumer_supplies =  tps65910_ldo8_supply,
 };
-void __sramfunc board_pmu_suspend(void)
+void __sramfunc board_pmu_tps65910_suspend(void)
 {	
 	int ret;
 	ret = gpio_readl(GPIO_SWPORTA_DDR);
@@ -582,7 +582,7 @@ void __sramfunc board_pmu_suspend(void)
 	ret = gpio_readl(GPIO_SWPORTA_DR);
 	gpio_writel(ret | GPIO1_A1_OUTPUT_HIGH, GPIO_SWPORTA_DR);  //set pmu_sleep output high
 }
-void __sramfunc board_pmu_resume(void)
+void __sramfunc board_pmu_tps65910_resume(void)
 {
 	int ret;
 	ret = gpio_readl(GPIO_SWPORTA_DDR);
diff --git a/arch/arm/mach-rk2928/board-rk2928-a720.c b/arch/arm/mach-rk2928/board-rk2928-a720.c
index 11c6ccc1a896..a4bb8bd0d35a 100755
--- a/arch/arm/mach-rk2928/board-rk2928-a720.c
+++ b/arch/arm/mach-rk2928/board-rk2928-a720.c
@@ -760,6 +760,21 @@ void  rk30_pwm_resume_voltage_set(void)
 #endif
 }
 
+void __sramfunc board_pmu_suspend(void)
+{      
+	#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_TPS65910)
+       if(g_pmic_type == PMIC_TYPE_TPS65910)
+       board_pmu_tps65910_resume(); 
+	#endif
+}
+
 #ifdef CONFIG_I2C1_RK30
 static struct i2c_board_info __initdata i2c1_info[] = {
 #if defined (CONFIG_GS_MMA7660)