diff options
| author | Jack Rosenthal <jrosenth@chromium.org> | 2021-01-15 08:18:21 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-01-16 02:38:01 +0000 |
| commit | 84cdec284c0288ae073af8a1b8290d529959c535 (patch) | |
| tree | 4a6dac2e1fb37386d5ce0d7145619c5936c80580 | |
| parent | 2d9f8f9e2f0796eb18aaa3b6f89975d2305b04b6 (diff) | |
| download | chrome-ec-84cdec284c0288ae073af8a1b8290d529959c535.tar.gz | |
zephyr: kohaku: bring up eSPI
Enable eSPI shim for kohaku.
BUG=b:177609422
BRANCH=none
TEST=run on kohaku with power sequencing follow-up
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I173e1a091b9e6e46b5207db19248afe102a665a0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2633163
Reviewed-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | zephyr/projects/kohaku/include/gpio_map.h | 2 | ||||
| -rw-r--r-- | zephyr/projects/kohaku/prj.conf | 3 | ||||
| -rw-r--r-- | zephyr/projects/volteer/include/gpio_map.h | 1 | ||||
| -rw-r--r-- | zephyr/shim/src/espi.c | 3 |
4 files changed, 7 insertions, 2 deletions
diff --git a/zephyr/projects/kohaku/include/gpio_map.h b/zephyr/projects/kohaku/include/gpio_map.h index d248216f8c..3f5b436562 100644 --- a/zephyr/projects/kohaku/include/gpio_map.h +++ b/zephyr/projects/kohaku/include/gpio_map.h @@ -9,7 +9,7 @@ #include <devicetree.h> #include <gpio_signal.h> -/* TODO(b/177609422): add kohaku GPIOs */ +#define GPIO_EC_PCH_WAKE_ODL NAMED_GPIO(pch_wake_l) /* * Set EC_CROS_GPIO_INTERRUPTS to a space-separated list of GPIO_INT items. diff --git a/zephyr/projects/kohaku/prj.conf b/zephyr/projects/kohaku/prj.conf index 37e56ca74f..3c26f87fc7 100644 --- a/zephyr/projects/kohaku/prj.conf +++ b/zephyr/projects/kohaku/prj.conf @@ -4,6 +4,9 @@ CONFIG_CROS_EC=y CONFIG_PLATFORM_EC=y +CONFIG_SHIMMED_TASKS=y + +CONFIG_ESPI=y CONFIG_I2C=y CONFIG_PLATFORM_EC_KEYBOARD=n diff --git a/zephyr/projects/volteer/include/gpio_map.h b/zephyr/projects/volteer/include/gpio_map.h index 01b7d63375..cda57386a8 100644 --- a/zephyr/projects/volteer/include/gpio_map.h +++ b/zephyr/projects/volteer/include/gpio_map.h @@ -25,6 +25,7 @@ #define GPIO_CPU_PROCHOT NAMED_GPIO(ec_prochot_odl) #define GPIO_EC_BATT_PRES_ODL NAMED_GPIO(ec_batt_pres_odl) #define GPIO_EC_PCH_SYS_PWROK NAMED_GPIO(ec_pch_sys_pwrok) +#define GPIO_EC_PCH_WAKE_ODL NAMED_GPIO(ec_pch_wake_odl) #define GPIO_EN_PP3300_A NAMED_GPIO(en_pp3300_a) #define GPIO_EN_PP5000 NAMED_GPIO(en_pp5000_a) #define GPIO_EN_PP5000_A NAMED_GPIO(en_pp5000_a) diff --git a/zephyr/shim/src/espi.c b/zephyr/shim/src/espi.c index 2a81bd0446..7f653f9543 100644 --- a/zephyr/shim/src/espi.c +++ b/zephyr/shim/src/espi.c @@ -15,6 +15,7 @@ #include "chipset.h" #include "common.h" #include "espi.h" +#include "gpio.h" #include "hooks.h" #include "lpc.h" #include "port80.h" @@ -269,7 +270,7 @@ static void lpc_update_wake(host_event_t wake_events) wake_events &= ~EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON); /* Signal is asserted low when wake events is non-zero */ - gpio_set_level(NAMED_GPIO(ec_pch_wake_odl), !wake_events); + gpio_set_level(GPIO_EC_PCH_WAKE_ODL, !wake_events); } static void lpc_generate_smi(void) |