From c858b043a109411044bdc9cb8534189207c08fc4 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Fri, 24 Apr 2015 17:30:36 -0700 Subject: [PATCH] veyron: Initialize EC interrupt GPIO and add them to coreboot tables This patch initializes the GPIO for the Chrome EC interrupt line on Veyron boards and passes its description through the coreboot table, so that payloads with keyboard support can use it to detect pending key presses. BRANCH=none BUG=chrome-os-partner:39514 TEST=Booted Jerry, confirmed that it could still detect keypresses. Confirmed that EC log does not show a huge amount of MKBP polls. Change-Id: I8b426621af088460929cfff0a4b46618e2a86725 Signed-off-by: Julius Werner Reviewed-on: https://chromium-review.googlesource.com/267344 Reviewed-by: David Hendricks Reviewed-by: Randall Spangler (cherry picked from commit 8ad95d667ef3af3fb217e3c370468dc1d6ec36c9) jwerner: Added Gus, Jaq, Minnie, Nicky and Thea. Signed-off-by: Julius Werner Reviewed-on: https://chromium-review.googlesource.com/282560 --- src/mainboard/google/veyron_gus/chromeos.c | 10 ++++++++++ src/mainboard/google/veyron_jaq/chromeos.c | 10 ++++++++++ src/mainboard/google/veyron_jerry/chromeos.c | 10 ++++++++++ src/mainboard/google/veyron_mighty/chromeos.c | 10 ++++++++++ src/mainboard/google/veyron_minnie/chromeos.c | 10 ++++++++++ src/mainboard/google/veyron_nicky/chromeos.c | 10 ++++++++++ src/mainboard/google/veyron_pinky/chromeos.c | 10 ++++++++++ src/mainboard/google/veyron_speedy/chromeos.c | 10 ++++++++++ src/mainboard/google/veyron_thea/chromeos.c | 10 ++++++++++ 9 files changed, 90 insertions(+) diff --git a/src/mainboard/google/veyron_gus/chromeos.c b/src/mainboard/google/veyron_gus/chromeos.c index d509a01653..e0f816cdc1 100644 --- a/src/mainboard/google/veyron_gus/chromeos.c +++ b/src/mainboard/google/veyron_gus/chromeos.c @@ -32,6 +32,7 @@ #define GPIO_POWER GPIO(0, A, 5) #define GPIO_RECOVERY GPIO(0, B, 1) #define GPIO_ECINRW GPIO(0, A, 7) +#define GPIO_ECIRQ GPIO(7, A, 7) void setup_chromeos_gpios(void) { @@ -39,6 +40,7 @@ void setup_chromeos_gpios(void) gpio_input_pullup(GPIO_LID); gpio_input(GPIO_POWER); gpio_input_pullup(GPIO_RECOVERY); + gpio_input(GPIO_ECIRQ); } void fill_lb_gpios(struct lb_gpios *gpios) @@ -92,6 +94,14 @@ void fill_lb_gpios(struct lb_gpios *gpios) GPIO_MAX_NAME_LENGTH); count++; + /* EC interrupt: GPIO active high */ + gpios->gpios[count].port = GPIO_ECIRQ.raw; + gpios->gpios[count].polarity = ACTIVE_LOW; + gpios->gpios[count].value = -1; + strncpy((char *)gpios->gpios[count].name, "EC interrupt", + GPIO_MAX_NAME_LENGTH); + count++; + /* Reset: GPIO active high (output) */ gpios->gpios[count].port = GPIO_RESET.raw; gpios->gpios[count].polarity = ACTIVE_HIGH; diff --git a/src/mainboard/google/veyron_jaq/chromeos.c b/src/mainboard/google/veyron_jaq/chromeos.c index d509a01653..e0f816cdc1 100644 --- a/src/mainboard/google/veyron_jaq/chromeos.c +++ b/src/mainboard/google/veyron_jaq/chromeos.c @@ -32,6 +32,7 @@ #define GPIO_POWER GPIO(0, A, 5) #define GPIO_RECOVERY GPIO(0, B, 1) #define GPIO_ECINRW GPIO(0, A, 7) +#define GPIO_ECIRQ GPIO(7, A, 7) void setup_chromeos_gpios(void) { @@ -39,6 +40,7 @@ void setup_chromeos_gpios(void) gpio_input_pullup(GPIO_LID); gpio_input(GPIO_POWER); gpio_input_pullup(GPIO_RECOVERY); + gpio_input(GPIO_ECIRQ); } void fill_lb_gpios(struct lb_gpios *gpios) @@ -92,6 +94,14 @@ void fill_lb_gpios(struct lb_gpios *gpios) GPIO_MAX_NAME_LENGTH); count++; + /* EC interrupt: GPIO active high */ + gpios->gpios[count].port = GPIO_ECIRQ.raw; + gpios->gpios[count].polarity = ACTIVE_LOW; + gpios->gpios[count].value = -1; + strncpy((char *)gpios->gpios[count].name, "EC interrupt", + GPIO_MAX_NAME_LENGTH); + count++; + /* Reset: GPIO active high (output) */ gpios->gpios[count].port = GPIO_RESET.raw; gpios->gpios[count].polarity = ACTIVE_HIGH; diff --git a/src/mainboard/google/veyron_jerry/chromeos.c b/src/mainboard/google/veyron_jerry/chromeos.c index d509a01653..e0f816cdc1 100644 --- a/src/mainboard/google/veyron_jerry/chromeos.c +++ b/src/mainboard/google/veyron_jerry/chromeos.c @@ -32,6 +32,7 @@ #define GPIO_POWER GPIO(0, A, 5) #define GPIO_RECOVERY GPIO(0, B, 1) #define GPIO_ECINRW GPIO(0, A, 7) +#define GPIO_ECIRQ GPIO(7, A, 7) void setup_chromeos_gpios(void) { @@ -39,6 +40,7 @@ void setup_chromeos_gpios(void) gpio_input_pullup(GPIO_LID); gpio_input(GPIO_POWER); gpio_input_pullup(GPIO_RECOVERY); + gpio_input(GPIO_ECIRQ); } void fill_lb_gpios(struct lb_gpios *gpios) @@ -92,6 +94,14 @@ void fill_lb_gpios(struct lb_gpios *gpios) GPIO_MAX_NAME_LENGTH); count++; + /* EC interrupt: GPIO active high */ + gpios->gpios[count].port = GPIO_ECIRQ.raw; + gpios->gpios[count].polarity = ACTIVE_LOW; + gpios->gpios[count].value = -1; + strncpy((char *)gpios->gpios[count].name, "EC interrupt", + GPIO_MAX_NAME_LENGTH); + count++; + /* Reset: GPIO active high (output) */ gpios->gpios[count].port = GPIO_RESET.raw; gpios->gpios[count].polarity = ACTIVE_HIGH; diff --git a/src/mainboard/google/veyron_mighty/chromeos.c b/src/mainboard/google/veyron_mighty/chromeos.c index d509a01653..e0f816cdc1 100644 --- a/src/mainboard/google/veyron_mighty/chromeos.c +++ b/src/mainboard/google/veyron_mighty/chromeos.c @@ -32,6 +32,7 @@ #define GPIO_POWER GPIO(0, A, 5) #define GPIO_RECOVERY GPIO(0, B, 1) #define GPIO_ECINRW GPIO(0, A, 7) +#define GPIO_ECIRQ GPIO(7, A, 7) void setup_chromeos_gpios(void) { @@ -39,6 +40,7 @@ void setup_chromeos_gpios(void) gpio_input_pullup(GPIO_LID); gpio_input(GPIO_POWER); gpio_input_pullup(GPIO_RECOVERY); + gpio_input(GPIO_ECIRQ); } void fill_lb_gpios(struct lb_gpios *gpios) @@ -92,6 +94,14 @@ void fill_lb_gpios(struct lb_gpios *gpios) GPIO_MAX_NAME_LENGTH); count++; + /* EC interrupt: GPIO active high */ + gpios->gpios[count].port = GPIO_ECIRQ.raw; + gpios->gpios[count].polarity = ACTIVE_LOW; + gpios->gpios[count].value = -1; + strncpy((char *)gpios->gpios[count].name, "EC interrupt", + GPIO_MAX_NAME_LENGTH); + count++; + /* Reset: GPIO active high (output) */ gpios->gpios[count].port = GPIO_RESET.raw; gpios->gpios[count].polarity = ACTIVE_HIGH; diff --git a/src/mainboard/google/veyron_minnie/chromeos.c b/src/mainboard/google/veyron_minnie/chromeos.c index d509a01653..e0f816cdc1 100644 --- a/src/mainboard/google/veyron_minnie/chromeos.c +++ b/src/mainboard/google/veyron_minnie/chromeos.c @@ -32,6 +32,7 @@ #define GPIO_POWER GPIO(0, A, 5) #define GPIO_RECOVERY GPIO(0, B, 1) #define GPIO_ECINRW GPIO(0, A, 7) +#define GPIO_ECIRQ GPIO(7, A, 7) void setup_chromeos_gpios(void) { @@ -39,6 +40,7 @@ void setup_chromeos_gpios(void) gpio_input_pullup(GPIO_LID); gpio_input(GPIO_POWER); gpio_input_pullup(GPIO_RECOVERY); + gpio_input(GPIO_ECIRQ); } void fill_lb_gpios(struct lb_gpios *gpios) @@ -92,6 +94,14 @@ void fill_lb_gpios(struct lb_gpios *gpios) GPIO_MAX_NAME_LENGTH); count++; + /* EC interrupt: GPIO active high */ + gpios->gpios[count].port = GPIO_ECIRQ.raw; + gpios->gpios[count].polarity = ACTIVE_LOW; + gpios->gpios[count].value = -1; + strncpy((char *)gpios->gpios[count].name, "EC interrupt", + GPIO_MAX_NAME_LENGTH); + count++; + /* Reset: GPIO active high (output) */ gpios->gpios[count].port = GPIO_RESET.raw; gpios->gpios[count].polarity = ACTIVE_HIGH; diff --git a/src/mainboard/google/veyron_nicky/chromeos.c b/src/mainboard/google/veyron_nicky/chromeos.c index d509a01653..e0f816cdc1 100644 --- a/src/mainboard/google/veyron_nicky/chromeos.c +++ b/src/mainboard/google/veyron_nicky/chromeos.c @@ -32,6 +32,7 @@ #define GPIO_POWER GPIO(0, A, 5) #define GPIO_RECOVERY GPIO(0, B, 1) #define GPIO_ECINRW GPIO(0, A, 7) +#define GPIO_ECIRQ GPIO(7, A, 7) void setup_chromeos_gpios(void) { @@ -39,6 +40,7 @@ void setup_chromeos_gpios(void) gpio_input_pullup(GPIO_LID); gpio_input(GPIO_POWER); gpio_input_pullup(GPIO_RECOVERY); + gpio_input(GPIO_ECIRQ); } void fill_lb_gpios(struct lb_gpios *gpios) @@ -92,6 +94,14 @@ void fill_lb_gpios(struct lb_gpios *gpios) GPIO_MAX_NAME_LENGTH); count++; + /* EC interrupt: GPIO active high */ + gpios->gpios[count].port = GPIO_ECIRQ.raw; + gpios->gpios[count].polarity = ACTIVE_LOW; + gpios->gpios[count].value = -1; + strncpy((char *)gpios->gpios[count].name, "EC interrupt", + GPIO_MAX_NAME_LENGTH); + count++; + /* Reset: GPIO active high (output) */ gpios->gpios[count].port = GPIO_RESET.raw; gpios->gpios[count].polarity = ACTIVE_HIGH; diff --git a/src/mainboard/google/veyron_pinky/chromeos.c b/src/mainboard/google/veyron_pinky/chromeos.c index dd781aae58..b64bae0a46 100644 --- a/src/mainboard/google/veyron_pinky/chromeos.c +++ b/src/mainboard/google/veyron_pinky/chromeos.c @@ -32,6 +32,7 @@ #define GPIO_POWER GPIO(0, A, 5) #define GPIO_RECOVERY GPIO(0, B, 1) #define GPIO_ECINRW GPIO(0, A, 7) +#define GPIO_ECIRQ GPIO(7, A, 7) void setup_chromeos_gpios(void) { @@ -39,6 +40,7 @@ void setup_chromeos_gpios(void) gpio_input_pullup(GPIO_LID); gpio_input(GPIO_POWER); gpio_input_pullup(GPIO_RECOVERY); + gpio_input(GPIO_ECIRQ); } void fill_lb_gpios(struct lb_gpios *gpios) @@ -93,6 +95,14 @@ void fill_lb_gpios(struct lb_gpios *gpios) GPIO_MAX_NAME_LENGTH); count++; + /* EC interrupt: GPIO active high */ + gpios->gpios[count].port = GPIO_ECIRQ.raw; + gpios->gpios[count].polarity = ACTIVE_LOW; + gpios->gpios[count].value = -1; + strncpy((char *)gpios->gpios[count].name, "EC interrupt", + GPIO_MAX_NAME_LENGTH); + count++; + /* Reset: GPIO active high (output) */ gpios->gpios[count].port = GPIO_RESET.raw; gpios->gpios[count].polarity = ACTIVE_HIGH; diff --git a/src/mainboard/google/veyron_speedy/chromeos.c b/src/mainboard/google/veyron_speedy/chromeos.c index d509a01653..e0f816cdc1 100644 --- a/src/mainboard/google/veyron_speedy/chromeos.c +++ b/src/mainboard/google/veyron_speedy/chromeos.c @@ -32,6 +32,7 @@ #define GPIO_POWER GPIO(0, A, 5) #define GPIO_RECOVERY GPIO(0, B, 1) #define GPIO_ECINRW GPIO(0, A, 7) +#define GPIO_ECIRQ GPIO(7, A, 7) void setup_chromeos_gpios(void) { @@ -39,6 +40,7 @@ void setup_chromeos_gpios(void) gpio_input_pullup(GPIO_LID); gpio_input(GPIO_POWER); gpio_input_pullup(GPIO_RECOVERY); + gpio_input(GPIO_ECIRQ); } void fill_lb_gpios(struct lb_gpios *gpios) @@ -92,6 +94,14 @@ void fill_lb_gpios(struct lb_gpios *gpios) GPIO_MAX_NAME_LENGTH); count++; + /* EC interrupt: GPIO active high */ + gpios->gpios[count].port = GPIO_ECIRQ.raw; + gpios->gpios[count].polarity = ACTIVE_LOW; + gpios->gpios[count].value = -1; + strncpy((char *)gpios->gpios[count].name, "EC interrupt", + GPIO_MAX_NAME_LENGTH); + count++; + /* Reset: GPIO active high (output) */ gpios->gpios[count].port = GPIO_RESET.raw; gpios->gpios[count].polarity = ACTIVE_HIGH; diff --git a/src/mainboard/google/veyron_thea/chromeos.c b/src/mainboard/google/veyron_thea/chromeos.c index d509a01653..e0f816cdc1 100644 --- a/src/mainboard/google/veyron_thea/chromeos.c +++ b/src/mainboard/google/veyron_thea/chromeos.c @@ -32,6 +32,7 @@ #define GPIO_POWER GPIO(0, A, 5) #define GPIO_RECOVERY GPIO(0, B, 1) #define GPIO_ECINRW GPIO(0, A, 7) +#define GPIO_ECIRQ GPIO(7, A, 7) void setup_chromeos_gpios(void) { @@ -39,6 +40,7 @@ void setup_chromeos_gpios(void) gpio_input_pullup(GPIO_LID); gpio_input(GPIO_POWER); gpio_input_pullup(GPIO_RECOVERY); + gpio_input(GPIO_ECIRQ); } void fill_lb_gpios(struct lb_gpios *gpios) @@ -92,6 +94,14 @@ void fill_lb_gpios(struct lb_gpios *gpios) GPIO_MAX_NAME_LENGTH); count++; + /* EC interrupt: GPIO active high */ + gpios->gpios[count].port = GPIO_ECIRQ.raw; + gpios->gpios[count].polarity = ACTIVE_LOW; + gpios->gpios[count].value = -1; + strncpy((char *)gpios->gpios[count].name, "EC interrupt", + GPIO_MAX_NAME_LENGTH); + count++; + /* Reset: GPIO active high (output) */ gpios->gpios[count].port = GPIO_RESET.raw; gpios->gpios[count].polarity = ACTIVE_HIGH;