diff options
| author | Sam Hurst <shurst@google.com> | 2021-06-24 09:32:43 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-06-28 23:30:37 +0000 |
| commit | bca2d153c7710465541b19610d98f00dba39b44e (patch) | |
| tree | 7f8236c44d4090d9162cc70f40ec8f44becdb0a7 /zephyr/projects/trogdor | |
| parent | 92a6d035526a4914e03e06d4eb7b0a6c928938e2 (diff) | |
| download | chrome-ec-bca2d153c7710465541b19610d98f00dba39b44e.tar.gz | |
zephyr: lazor: Enable mkbp wake event masks
Enable the following host mkbp wake masks:
EC_HOST_EVENT_LID_OPEN
EC_HOST_EVENT_POWER_BUTTON
EC_HOST_EVENT_AC_CONNECTED
EC_HOST_EVENT_AC_DISCONNECTED
EC_HOST_EVENT_HANG_DETECT
EC_HOST_EVENT_RTC
EC_HOST_EVENT_MODE_CHANGE
EC_HOST_EVENT_DEVICE
EC_MKBP_EVENT_KEY_MATRIX
EC_MKBP_EVENT_HOST_EVENT
EC_MKBP_EVENT_SENSOR_FIFO
BRANCH=None
BUG=b:190503252
TEST=make buildall
TEST=zmake testall
Signed-off-by: Sam Hurst <shurst@google.com>
Change-Id: I40c2206892e9d4109821227eee1ff017ba501462
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2985821
Reviewed-by: Keith Short <keithshort@chromium.org>
Reviewed-by: Wai-Hong Tam <waihong@google.com>
Diffstat (limited to 'zephyr/projects/trogdor')
| -rw-r--r-- | zephyr/projects/trogdor/boards/arm/trogdor/trogdor.dts | 20 | ||||
| -rw-r--r-- | zephyr/projects/trogdor/lazor/prj.conf | 4 |
2 files changed, 24 insertions, 0 deletions
diff --git a/zephyr/projects/trogdor/boards/arm/trogdor/trogdor.dts b/zephyr/projects/trogdor/boards/arm/trogdor/trogdor.dts index be1adef120..4bfbaca14d 100644 --- a/zephyr/projects/trogdor/boards/arm/trogdor/trogdor.dts +++ b/zephyr/projects/trogdor/boards/arm/trogdor/trogdor.dts @@ -8,6 +8,7 @@ #include <cros/nuvoton/npcx7.dtsi> #include <dt-bindings/adc/adc.h> #include <dt-bindings/gpio_defines.h> +#include <dt-bindings/wake_mask_event_defines.h> #include <nuvoton/npcx7m7fc.dtsi> / { @@ -36,6 +37,25 @@ disabled = "hostcmd"; }; + ec-mkbp-host-event-wakeup-mask { + compatible = "ec-wake-mask-event"; + wakeup-mask = <(HOST_EVENT_LID_OPEN | \ + HOST_EVENT_POWER_BUTTON | \ + HOST_EVENT_AC_CONNECTED | \ + HOST_EVENT_AC_DISCONNECTED | \ + HOST_EVENT_HANG_DETECT | \ + HOST_EVENT_RTC | \ + HOST_EVENT_MODE_CHANGE | \ + HOST_EVENT_DEVICE)>; + }; + + ec-mkbp-event-wakeup-mask { + compatible = "ec-wake-mask-event"; + wakeup-mask = <(MKBP_EVENT_KEY_MATRIX | \ + MKBP_EVENT_HOST_EVENT | \ + MKBP_EVENT_SENSOR_FIFO)>; + }; + named-i2c-ports { compatible = "named-i2c-ports"; diff --git a/zephyr/projects/trogdor/lazor/prj.conf b/zephyr/projects/trogdor/lazor/prj.conf index c8423e2d9b..1682fdf686 100644 --- a/zephyr/projects/trogdor/lazor/prj.conf +++ b/zephyr/projects/trogdor/lazor/prj.conf @@ -43,6 +43,10 @@ CONFIG_PLATFORM_EC_CHIPSET_RESUME_INIT_HOOK=y # Trogdor family does not use EFS2 (toggled by PLATFORM_EC_VBOOT). CONFIG_PLATFORM_EC_VBOOT=n +# MKBP event mask +CONFIG_PLATFORM_EC_MKBP_EVENT_WAKEUP_MASK=y +CONFIG_PLATFORM_EC_MKBP_HOST_EVENT_WAKEUP_MASK=y + # MKBP event CONFIG_PLATFORM_EC_MKBP_EVENT=y CONFIG_PLATFORM_EC_MKBP_USE_GPIO=y |