GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PC80 RTC: Use acpi_is_wakeup_s3() 

Change-Id: Idc4c47f3802019c2853ec71f8e9c057c3ab8d3ee
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/6074
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
This commit is contained in:
Kyösti Mälkki 2014-06-20 05:38:07 +03:00 committed by Patrick Georgi
parent 6202aea922
commit 9d9eb1ec8d
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/drivers/pc80/mc146818rtc.c
View File

@ -8,10 +8,7 @@
#include "option_table.h" #include "option_table.h"
#include <cbfs.h> #include <cbfs.h>
#endif #endif
#if CONFIG_HAVE_ACPI_RESUME
#include <arch/acpi.h> #include <arch/acpi.h>
#endif
static void rtc_update_cmos_date(u8 has_century) static void rtc_update_cmos_date(u8 has_century)
{ {
@ -72,16 +69,14 @@ void rtc_init(int invalid)
#endif #endif
#ifndef __PRE_RAM__ #ifndef __PRE_RAM__
#if CONFIG_HAVE_ACPI_RESUME
/* /*
* Avoid clearing pending interrupts and resetting the RTC control * Avoid clearing pending interrupts and resetting the RTC control
* register in the resume path because the Linux kernel relies on * register in the resume path because the Linux kernel relies on
* this to know if it should restart the RTC timer queue if the wake * this to know if it should restart the RTC timer queue if the wake
* was due to the RTC alarm. * was due to the RTC alarm.
*/ */
if (acpi_slp_type == 3) if (acpi_is_wakeup_s3())
return; return;
#endif /* CONFIG_HAVE_ACPI_RESUME */
#endif /* __PRE_RAM__ */ #endif /* __PRE_RAM__ */
printk(BIOS_DEBUG, "RTC Init\n"); printk(BIOS_DEBUG, "RTC Init\n");