From: cdy Date: Sun, 27 Jan 2013 08:58:04 +0000 (+0800) Subject: rk3188 ds1006h: act8846 pmu shutdown X-Git-Tag: firefly_0821_release~7745 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=77357cd5baa0a601b69ea082e1e1ad97cff9161f;p=firefly-linux-kernel-4.4.55.git rk3188 ds1006h: act8846 pmu shutdown --- diff --git a/arch/arm/mach-rk3188/board-rk3188-ds1006h.c b/arch/arm/mach-rk3188/board-rk3188-ds1006h.c index 54c658a9e13a..938a2cc04121 100755 --- a/arch/arm/mach-rk3188/board-rk3188-ds1006h.c +++ b/arch/arm/mach-rk3188/board-rk3188-ds1006h.c @@ -1669,7 +1669,6 @@ static void __init rk30_i2c_register_board_info(void) static void rk30_pm_power_off(void) { printk(KERN_ERR "rk30_pm_power_off start...\n"); - gpio_direction_output(POWER_ON_PIN, GPIO_LOW); #if defined(CONFIG_MFD_WM831X) wm831x_set_bits(Wm831x,WM831X_GPIO_LEVEL,0x0001,0x0000); //set sys_pwr 0 wm831x_device_shutdown(Wm831x);//wm8326 shutdown @@ -1682,9 +1681,13 @@ static void rk30_pm_power_off(void) printk("enter restart===========\n"); arm_pm_restart(0, NULL); } - //act8931_device_shutdown(); + else + { + act8846_device_shutdown(); + } } #endif + gpio_direction_output(POWER_ON_PIN, GPIO_LOW); while (1); }