diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2015-08-13 03:06:02 -0500 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2015-08-19 14:04:03 +0000 |
| commit | a537f9a2ecfd2753f06a5707af965658e21dd7e1 (patch) | |
| tree | df12f30ccffa7440e0897cd89a13ea7f9f71c60e | |
| parent | d3a36b8a4611c3fbafc73c4d178315ccf7f9c7f7 (diff) | |
| download | coreboot-a537f9a2ecfd2753f06a5707af965658e21dd7e1.tar.xz | |
glados: use macros for magic numbers in ASL
The skylake SoC code now has macros for the previously
hard-code numbers for IRQs and GPEs. Switch over to using
those as they bring a little more clarity.
BUG=chrome-os-partner:43522
BRANCH=None
TEST=Built and booted glados.
Original-Change-Id: Ic8fcc59d680cdddec9dfbc3bf679731f6d786793
Original-Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/293411
Original-Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Change-Id: I594907005372100a3c9d17dda9d17769844ad272
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/11234
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
| -rw-r--r-- | src/mainboard/google/glados/acpi/mainboard.asl | 6 | ||||
| -rw-r--r-- | src/mainboard/google/glados/ec.h | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/mainboard/google/glados/acpi/mainboard.asl b/src/mainboard/google/glados/acpi/mainboard.asl index 53001e4af6..f8bc462ee5 100644 --- a/src/mainboard/google/glados/acpi/mainboard.asl +++ b/src/mainboard/google/glados/acpi/mainboard.asl @@ -17,8 +17,10 @@ * Foundation, Inc. */ +#include <soc/gpio.h> + #define BOARD_TRACKPAD_I2C_ADDR 0x15 -#define BOARD_TRACKPAD_IRQ 0x33 +#define BOARD_TRACKPAD_IRQ GPP_B3_IRQ Scope (\_SB) { @@ -31,7 +33,7 @@ Scope (\_SB) } /* EC wake is LAN_WAKE# which is a special DeepSX wake pin */ - Name (_PRW, Package(){ 112, 5 }) /* LAN_WAKE_EN */ + Name (_PRW, Package(){ GPE0_LAN_WAK, 5 }) } Device (PWRB) diff --git a/src/mainboard/google/glados/ec.h b/src/mainboard/google/glados/ec.h index d43b57ca45..bfe4a110b5 100644 --- a/src/mainboard/google/glados/ec.h +++ b/src/mainboard/google/glados/ec.h @@ -23,11 +23,10 @@ #include <ec/google/chromeec/ec_commands.h> #include <soc/gpio.h> +#include <soc/gpe.h> -/* GPP_E16 is EC_SCI_L, however the EC_SCI_GPI needs to be a bit - * number relative to the GPE0 block. GPP_E is routed as the dword 2 - * in the GPE0 block. Therefore, 16 + 2 * 32 = 80. */ -#define EC_SCI_GPI 80 +/* GPP_E16 is EC_SCI_L. GPP_E group is routed to dword 2 in the GPE0 block. */ +#define EC_SCI_GPI GPE0_DW2_16 #define EC_SMI_GPI GPP_E15 #define MAINBOARD_EC_SCI_EVENTS \ |