From bcd99301b8e2e312cb6a6a4d3adf749167fb84f9 Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Fri, 21 Aug 2015 11:36:23 -0700 Subject: [PATCH] intel/sklrvp: Switch to using GPIO IRQ defines Use the macro for GPP_E22_IRQ instead of the ACPI code so it can be removed. BUG=chrome-os-partner:40635 BRANCH=none TEST=emerge-sklrvp coreboot Change-Id: I09bea748fea34072d4f8ad7470d37e423b7f63de Signed-off-by: Patrick Georgi Original-Commit-Id: 89069f5f318329182390cad679511547b7d2a6d5 Original-Change-Id: Iad181b4ce1c557ce8d17645431d8ba6f558bb837 Original-Signed-off-by: Duncan Laurie Original-Reviewed-on: https://chromium-review.googlesource.com/295171 Original-Reviewed-by: Aaron Durbin Reviewed-on: http://review.coreboot.org/11427 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/mainboard/intel/sklrvp/acpi/mainboard.asl | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/mainboard/intel/sklrvp/acpi/mainboard.asl b/src/mainboard/intel/sklrvp/acpi/mainboard.asl index d771f627eb..c80a03d5ad 100644 --- a/src/mainboard/intel/sklrvp/acpi/mainboard.asl +++ b/src/mainboard/intel/sklrvp/acpi/mainboard.asl @@ -18,9 +18,7 @@ * Foundation, Inc. */ -/* REAKTEK Audio Jack Interrupt */ -#define GPIO_SKL_LP_GPP_E22 0x02040016 - +#include #include /* @@ -138,18 +136,11 @@ Scope (\_SB.PCI0.I2C0) Name (SBFI, ResourceTemplate () { Interrupt (ResourceConsumer, Level, ActiveLow, - ExclusiveAndWake, ,, _Y22) + ExclusiveAndWake) { - 0x00000000, + GPP_E22_IRQ } }) - - /* _INT: Interrupts */ - CreateDWordField (SBFI, _Y22._INT, INT2) - - Store (INUM (GPIO_SKL_LP_GPP_E22), INT2) - - Return (ConcatenateResTemplate (RBUF, SBFI)) } Method (_STA, 0, NotSerialized)