GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kyösti Mälkki 2014-06-20 05:41:21 +03:00 committed by Patrick Georgi
parent c3c4a38c95
commit 6202aea922
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/drivers/pc80/keyboard.c
View File

@ -25,9 +25,7 @@
#include <arch/io.h> #include <arch/io.h>
#include <delay.h> #include <delay.h>
#include <types.h> #include <types.h>
#if CONFIG_HAVE_ACPI_RESUME
#include <arch/acpi.h> #include <arch/acpi.h>
#endif
#define KBD_DATA 0x60 #define KBD_DATA 0x60
#define KBD_COMMAND 0x64 #define KBD_COMMAND 0x64
@ -202,10 +200,8 @@ void pc_keyboard_init(void)
if (!CONFIG_DRIVERS_PS2_KEYBOARD) if (!CONFIG_DRIVERS_PS2_KEYBOARD)
return; return;
#if CONFIG_HAVE_ACPI_RESUME if (acpi_is_wakeup_s3())
if (acpi_slp_type == 3)
return; return;
#endif
printk(BIOS_DEBUG, "Keyboard init...\n"); printk(BIOS_DEBUG, "Keyboard init...\n");

7
src/superio/smsc/mec1308/superio.c
View File

@ -29,9 +29,6 @@
#include <pc80/keyboard.h> #include <pc80/keyboard.h>
#include <stdlib.h> #include <stdlib.h>
#include "mec1308.h" #include "mec1308.h"
#if CONFIG_HAVE_ACPI_RESUME
#include <arch/acpi.h>
#endif
static void mec1308_init(device_t dev) static void mec1308_init(device_t dev)
{ {
@ -41,10 +38,6 @@ static void mec1308_init(device_t dev)
switch(dev->path.pnp.device) { switch(dev->path.pnp.device) {
case MEC1308_KBC: case MEC1308_KBC:
#if CONFIG_HAVE_ACPI_RESUME
if (acpi_slp_type == 3)
return;
#endif
pc_keyboard_init(); pc_keyboard_init();
break; break;
} }