shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 21:07:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0

Browse Source
This commit is contained in:
xbw
2012-09-28 18:19:25 +08:00
parent b30958b394 37f550b376
commit 9daa908a12
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/mach-rk2928/board-rk2928-a720.c
View File

@@ -816,9 +816,20 @@ static void __init rk30_i2c_register_board_info(void)
//end of i2c
#define POWER_ON_PIN RK2928_PIN1_PA2 //power_hold
#if defined(CONFIG_REGULATOR_ACT8931)
extern int act8931_charge_det ;
#endif
static void rk2928_pm_power_off(void)
{
printk(KERN_ERR "rk2928_pm_power_off start...\n");
#if defined(CONFIG_REGULATOR_ACT8931)
if(g_pmic_type == PMIC_TYPE_ACT8931)
{
if(act8931_charge_det)
arm_pm_restart(0, NULL);
}
#endif
#if defined(CONFIG_MFD_TPS65910)
if(g_pmic_type == PMIC_TYPE_TPS65910)