diff options
| author | Wai-Hong Tam <waihong@google.com> | 2021-04-29 16:43:16 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-05-01 03:02:11 +0000 |
| commit | 7b08eda737c78d7bbf7e64b27e4c2a69c46b334f (patch) | |
| tree | 388cc035e2ac2568a40ffd6419b5c3da3111de33 /zephyr/projects/trogdor/lazor | |
| parent | b30f7b8528b87933c4c060aa26019c04227fa3f1 (diff) | |
| download | chrome-ec-7b08eda737c78d7bbf7e64b27e4c2a69c46b334f.tar.gz | |
zephyr: lazor: Include board-specific hibernate code
Include the board-specific hibernate code in CrOS EC directory.
Add and rename the hibernate-related GPIO enums.
BRANCH=None
BUG=b:183745774
TEST=Built the Zephyr image and tested EC hibernate on Lazor.
Verified all wake sources: power button, lid open, ACOK, and EC reset
Change-Id: I2f7371e033f45227c0e53290608862e5192434f2
Signed-off-by: Wai-Hong Tam <waihong@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2861058
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'zephyr/projects/trogdor/lazor')
| -rw-r--r-- | zephyr/projects/trogdor/lazor/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | zephyr/projects/trogdor/lazor/gpio.dts | 4 | ||||
| -rw-r--r-- | zephyr/projects/trogdor/lazor/include/gpio_map.h | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/zephyr/projects/trogdor/lazor/CMakeLists.txt b/zephyr/projects/trogdor/lazor/CMakeLists.txt index 3c8409e2ed..4f0d915619 100644 --- a/zephyr/projects/trogdor/lazor/CMakeLists.txt +++ b/zephyr/projects/trogdor/lazor/CMakeLists.txt @@ -17,6 +17,7 @@ set(PLATFORM_EC_BOARD "${PLATFORM_EC}/board/lazor" CACHE PATH "Path to the platform/ec board directory") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC + "${PLATFORM_EC_BASEBOARD}/hibernate.c" "${PLATFORM_EC_BASEBOARD}/usbc_config.c" "${PLATFORM_EC_BASEBOARD}/usb_pd_policy.c") @@ -25,6 +26,7 @@ zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_LED_COMMON zephyr_library_sources( "${PLATFORM_EC_BOARD}/battery.c" + "${PLATFORM_EC_BOARD}/hibernate.c" "${PLATFORM_EC_BOARD}/sku.c" "${PLATFORM_EC_BOARD}/switchcap.c" "${PLATFORM_EC_BOARD}/usbc_config.c") diff --git a/zephyr/projects/trogdor/lazor/gpio.dts b/zephyr/projects/trogdor/lazor/gpio.dts index ff9d5210d6..46058d0166 100644 --- a/zephyr/projects/trogdor/lazor/gpio.dts +++ b/zephyr/projects/trogdor/lazor/gpio.dts @@ -118,7 +118,7 @@ }; gpio_accel_gyro_int_l: accel_gyro_int_l { gpios = <&gpioa 0 GPIO_INPUT>; - enum-name = "GPIO_EC_IMU_INT_L"; + enum-name = "GPIO_ACCEL_GYRO_INT_L"; label = "ACCEL_GYRO_INT_L"; }; da9313_gpio0 { @@ -168,6 +168,7 @@ }; hibernate_l { gpios = <&gpio5 2 GPIO_OUT_HIGH>; + enum-name = "GPIO_HIBERNATE_L"; label = "HIBERNATE_L"; }; switchcap_on { @@ -201,6 +202,7 @@ }; lid_accel_int_l { gpios = <&gpio5 6 GPIO_INPUT>; + enum-name = "GPIO_LID_ACCEL_INT_L"; label = "LID_ACCEL_INT_L"; }; trackpad_int_gate { diff --git a/zephyr/projects/trogdor/lazor/include/gpio_map.h b/zephyr/projects/trogdor/lazor/include/gpio_map.h index c21fdc2126..13d07824e1 100644 --- a/zephyr/projects/trogdor/lazor/include/gpio_map.h +++ b/zephyr/projects/trogdor/lazor/include/gpio_map.h @@ -59,7 +59,8 @@ GPIO_INT(GPIO_USB_A0_OC_ODL, GPIO_INT_EDGE_BOTH, usba_oc_interrupt) \ GPIO_INT(GPIO_CCD_MODE_ODL, GPIO_INT_EDGE_FALLING, \ board_connect_c0_sbu) \ - GPIO_INT(GPIO_EC_IMU_INT_L, GPIO_INT_EDGE_FALLING, bmi160_interrupt) \ + GPIO_INT(GPIO_ACCEL_GYRO_INT_L, GPIO_INT_EDGE_FALLING, \ + bmi160_interrupt) \ GPIO_INT(GPIO_TABLET_MODE_L, GPIO_INT_EDGE_BOTH, gmr_tablet_switch_isr) #endif /* __ZEPHYR_GPIO_MAP_H */ |