[coreboot-gerrit] New patch to review for coreboot: 6eebccc PS2 keyboard: Use acpi_is_wakeup_s3()
Kyösti Mälkki (kyosti.malkki@gmail.com)
gerrit at coreboot.org
Fri Jun 20 09:39:08 CEST 2014
Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6073
-gerrit
commit 6eebcccfe8876b953d1d546350fb3063afffa6d9
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date: Fri Jun 20 05:41:21 2014 +0300
PS2 keyboard: Use acpi_is_wakeup_s3()
Change-Id: I812cc40e50a1e7e13caed48a1693feb8658b645c
Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
src/drivers/pc80/keyboard.c | 6 +-----
src/superio/smsc/mec1308/superio.c | 7 -------
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/src/drivers/pc80/keyboard.c b/src/drivers/pc80/keyboard.c
index 6a573d8..06eae46 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 54d99fb..9e293bd 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;
}
More information about the coreboot-gerrit
mailing list