summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-06-20 05:38:07 +0300
committerPatrick Georgi <patrick@georgi-clan.de>2014-06-21 08:04:54 +0200
commit9d9eb1ec8d6f30fa000aa87246310757214337d5 (patch)
treeb3b5459f069e7f97d099b3cab2110d888fee4245
parent6202aea9220f6a423429cba625c0444f88f9bb58 (diff)
downloadcoreboot-9d9eb1ec8d6f30fa000aa87246310757214337d5.tar.xz
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>
-rw-r--r--src/drivers/pc80/mc146818rtc.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/drivers/pc80/mc146818rtc.c b/src/drivers/pc80/mc146818rtc.c
index 6f8a4eb350..c54f6cefa5 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");