Kyösti Mälkki (kyosti.malkki@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6074
-gerrit
commit b9f4b72c1462da0887e848270e18d2c350c2c3f2 Author: Kyösti Mälkki kyosti.malkki@gmail.com Date: Fri Jun 20 05:38:07 2014 +0300
PC80 RTC: Use acpi_is_wakeup_s3()
Change-Id: Idc4c47f3802019c2853ec71f8e9c057c3ab8d3ee Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- src/drivers/pc80/mc146818rtc.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/drivers/pc80/mc146818rtc.c b/src/drivers/pc80/mc146818rtc.c index 6f8a4eb..c54f6ce 100644 --- a/src/drivers/pc80/mc146818rtc.c +++ b/src/drivers/pc80/mc146818rtc.c @@ -8,10 +8,7 @@ #include "option_table.h" #include <cbfs.h> #endif -#if CONFIG_HAVE_ACPI_RESUME #include <arch/acpi.h> -#endif -
static void rtc_update_cmos_date(u8 has_century) { @@ -72,16 +69,14 @@ void rtc_init(int invalid) #endif
#ifndef __PRE_RAM__ -#if CONFIG_HAVE_ACPI_RESUME /* * Avoid clearing pending interrupts and resetting the RTC control * 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 * was due to the RTC alarm. */ - if (acpi_slp_type == 3) + if (acpi_is_wakeup_s3()) return; -#endif /* CONFIG_HAVE_ACPI_RESUME */ #endif /* __PRE_RAM__ */
printk(BIOS_DEBUG, "RTC Init\n");