summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-06-20 05:41:21 +0300
committerPatrick Georgi <patrick@georgi-clan.de>2014-06-21 08:04:54 +0200
commit6202aea9220f6a423429cba625c0444f88f9bb58 (patch)
tree0c1df41983dfc35c7a86044fe171b00cbf661a8c
parentc3c4a38c95b90fbf713e98f7b4d1e5be18bee633 (diff)
downloadcoreboot-6202aea9220f6a423429cba625c0444f88f9bb58.tar.xz
PS2 keyboard: Use acpi_is_wakeup_s3()
Change-Id: I812cc40e50a1e7e13caed48a1693feb8658b645c Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/6073 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/keyboard.c6
-rw-r--r--src/superio/smsc/mec1308/superio.c7
2 files changed, 1 insertions, 12 deletions
diff --git a/src/drivers/pc80/keyboard.c b/src/drivers/pc80/keyboard.c
index 6a573d8e08..06eae463e1 100644
--- a/src/drivers/pc80/keyboard.c
+++ b/src/drivers/pc80/keyboard.c
@@ -25,9 +25,7 @@
#include <arch/io.h>
#include <delay.h>
#include <types.h>
-#if CONFIG_HAVE_ACPI_RESUME
#include <arch/acpi.h>
-#endif
#define KBD_DATA 0x60
#define KBD_COMMAND 0x64
@@ -202,10 +200,8 @@ void pc_keyboard_init(void)
if (!CONFIG_DRIVERS_PS2_KEYBOARD)
return;
-#if CONFIG_HAVE_ACPI_RESUME
- if (acpi_slp_type == 3)
+ if (acpi_is_wakeup_s3())
return;
-#endif
printk(BIOS_DEBUG, "Keyboard init...\n");
diff --git a/src/superio/smsc/mec1308/superio.c b/src/superio/smsc/mec1308/superio.c
index 54d99fb5c7..9e293bded8 100644
--- a/src/superio/smsc/mec1308/superio.c
+++ b/src/superio/smsc/mec1308/superio.c
@@ -29,9 +29,6 @@
#include <pc80/keyboard.h>
#include <stdlib.h>
#include "mec1308.h"
-#if CONFIG_HAVE_ACPI_RESUME
-#include <arch/acpi.h>
-#endif
static void mec1308_init(device_t dev)
{
@@ -41,10 +38,6 @@ static void mec1308_init(device_t dev)
switch(dev->path.pnp.device) {
case MEC1308_KBC:
-#if CONFIG_HAVE_ACPI_RESUME
- if (acpi_slp_type == 3)
- return;
-#endif
pc_keyboard_init();
break;
}