mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
Merge branches 'pm-avs', 'pm-clk', 'pm-devfreq' and 'pm-sleep'
* pm-avs: PM / AVS: rockchip-io: add io selectors and supplies for rk3399 * pm-clk: PM / clk: Add support for obtaining clocks from device-tree * pm-devfreq: PM / devfreq: Spelling s/frequnecy/frequency/ * pm-sleep: ACPI / PM: Runtime resume devices when waking from hibernate PM / sleep: Clear pm_suspend_global_flags upon hibernate
This commit is contained in:
commit
3513ac743d
7 changed files with 170 additions and 1 deletions
|
|
@ -748,6 +748,7 @@ static int acpi_hibernation_enter(void)
|
|||
|
||||
static void acpi_hibernation_leave(void)
|
||||
{
|
||||
pm_set_resume_via_firmware();
|
||||
/*
|
||||
* If ACPI is not enabled by the BIOS and the boot kernel, we need to
|
||||
* enable it here.
|
||||
|
|
|
|||
Loading…
Reference in a new issue