Merge branch 'master' of git://git.denx.de/u-boot-x86

[u-boot] / arch / x86 / cpu / ivybridge / lpc.c

diff --git a/arch/x86/cpu/ivybridge/lpc.c b/arch/x86/cpu/ivybridge/lpc.c
index bc1a0f06fbe31d6829a7a1c75c38c50c0c768a11..af5d4a89089bad99778d5aef6799af6781143e86 100644 (file)
--- a/arch/x86/cpu/ivybridge/lpc.c
+++ b/arch/x86/cpu/ivybridge/lpc.c
@@ -240,19 +240,9 @@ static void pch_rtc_init(pci_dev_t dev)
        }
        debug("rtc_failed = 0x%x\n", rtc_failed);
 
-#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 timerqueue if the wake
-        * was due to the RTC alarm.
-        */
-       if (acpi_get_slp_type() == 3)
-               return;
-#endif
        /* TODO: Handle power failure */
        if (rtc_failed)
                printf("RTC power failed\n");
-       rtc_init();
 }
 
 /* CougarPoint PCH Power Management init */