From 2dbe51a17c3b7672a99965b160204ffceefccb6d Mon Sep 17 00:00:00 2001 From: Jett Rink Date: Wed, 9 Jan 2019 09:42:07 -0700 Subject: mainboard/google/octopus: configure EC_AP_INT_ODL Enable the EC_AP_INT_ODL interrupt on GPIO_134 for all octopus boards that support it. Also removing unnecessary IO standby support since we don't use this pin to wake up the SoC. BRANCH=octopus BUG=b:122552125,b:120679547 TEST=CTS tests with changes Change-Id: I018864ae5fa400372b5b443e49828e8202b9aa4d Signed-off-by: Jett Rink Reviewed-on: https://review.coreboot.org/c/30788 Reviewed-by: Aaron Durbin Reviewed-by: Justin TerAvest Tested-by: build bot (Jenkins) --- src/mainboard/google/octopus/variants/baseboard/gpio.c | 4 +++- .../google/octopus/variants/baseboard/include/baseboard/ec.h | 3 +++ .../google/octopus/variants/baseboard/include/baseboard/gpio.h | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) (limited to 'src/mainboard/google/octopus/variants/baseboard') diff --git a/src/mainboard/google/octopus/variants/baseboard/gpio.c b/src/mainboard/google/octopus/variants/baseboard/gpio.c index 566422d390..3828ae9d20 100644 --- a/src/mainboard/google/octopus/variants/baseboard/gpio.c +++ b/src/mainboard/google/octopus/variants/baseboard/gpio.c @@ -195,7 +195,9 @@ static const struct pad_config gpio_table[] = { PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_132, NONE, DEEP, NF1, HIZCRx1, DISPUPD),/* HV_DDI1_HPD */ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_133, NONE, DEEP, NF1, HIZCRx1, DISPUPD),/* HV_EDP_HPD */ - PAD_NC(GPIO_134, NONE),/* GPIO_134 -- unused */ + /* EC_AP_INT_ODL */ + PAD_CFG_GPI_APIC_LOW(GPIO_134, NONE, DEEP), + PAD_CFG_GPI_IRQ_WAKE(GPIO_135, NONE, DEEP, LEVEL, INVERT),/* GPIO_135 -- TRACKPAD_INT1_1V8_ODL */ PAD_CFG_GPI_APIC_IOS(GPIO_136, NONE, DEEP, LEVEL, INVERT, TxDRxE, DISPUPD),/* GPIO_136 -- PMIC_PCH_INT_ODL */ PAD_CFG_GPI_APIC_IOS(GPIO_137, NONE, DEEP, LEVEL, INVERT, HIZCRx1, DISPUPD),/* GPIO_137 -- HP_INT_ODL */ diff --git a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/ec.h b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/ec.h index d416673eb5..e86dc2db80 100644 --- a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/ec.h +++ b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/ec.h @@ -84,4 +84,7 @@ #define SIO_EC_HOST_ENABLE /* EC Host Interface Resources */ #define SIO_EC_ENABLE_PS2K /* Enable PS/2 Keyboard */ +/* Enable EC sync interrupt, EC_SYNC_IRQ is defined in baseboard/gpio.h */ +#define EC_ENABLE_SYNC_IRQ + #endif diff --git a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/gpio.h b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/gpio.h index b29ec38b1c..b40840377f 100644 --- a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/gpio.h +++ b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/gpio.h @@ -39,4 +39,7 @@ #define MEM_CONFIG2 GPIO_70 #define MEM_CONFIG3 GPIO_71 +/* EC sync irq is GPP_134_IRQ */ +#define EC_SYNC_IRQ GPIO_134_IRQ + #endif /* BASEBOARD_GPIO_H */ -- cgit v1.2.3