diff options
| author | Caveh Jalali <caveh@chromium.org> | 2021-03-04 17:01:13 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-03-05 06:21:23 +0000 |
| commit | af96d6ad9f767dd223ede76fb58b7461b515b494 (patch) | |
| tree | 3efe7d6f9246e469410eddcbd98a5125b963d8ee | |
| parent | e4eb9d80a7ea176df7d4fa423b47ee5da9d41200 (diff) | |
| download | chrome-ec-af96d6ad9f767dd223ede76fb58b7461b515b494.tar.gz | |
brya: Enable power button
This enables the power button feature form the EC to the SoC.
BRANCH=none
BUG=b:173575131
TEST=buildall passes
Change-Id: Ife5eaa37d269ab4fa5a72be4fec1dec7c4536749
Signed-off-by: Caveh Jalali <caveh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2738917
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
| -rw-r--r-- | baseboard/brya/baseboard.h | 2 | ||||
| -rw-r--r-- | board/brya/board.c | 9 | ||||
| -rw-r--r-- | board/brya/board.h | 8 | ||||
| -rw-r--r-- | board/brya/ec.tasklist | 1 |
4 files changed, 6 insertions, 14 deletions
diff --git a/baseboard/brya/baseboard.h b/baseboard/brya/baseboard.h index 44b6236e10..a98e125d46 100644 --- a/baseboard/brya/baseboard.h +++ b/baseboard/brya/baseboard.h @@ -45,6 +45,8 @@ #define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_CPU_PROCHOT_ACTIVE_LOW #define CONFIG_EXTPOWER_GPIO +#define CONFIG_POWER_BUTTON +#define CONFIG_POWER_BUTTON_X86 #define CONFIG_POWER_S0IX #define CONFIG_POWER_SLEEP_FAILURE_DETECTION #define CONFIG_POWER_TRACK_HOST_SLEEP_STATE diff --git a/board/brya/board.c b/board/brya/board.c index 6d799b8bb6..449fabc59d 100644 --- a/board/brya/board.c +++ b/board/brya/board.c @@ -6,6 +6,7 @@ #include "common.h" #include "cbi_ec_fw_config.h" +#include "power_button.h" #include "power.h" #include "switch.h" #include "throttle_ap.h" @@ -31,14 +32,6 @@ const union brya_cbi_fw_config fw_config_defaults = { }; /* - * remove when we enable CONFIG_POWER_BUTTON - */ - -void power_button_interrupt(enum gpio_signal signal) -{ -} - -/* * remove when we enable CONFIG_VOLUME_BUTTONS */ diff --git a/board/brya/board.h b/board/brya/board.h index 7583b4347c..37ef956c7c 100644 --- a/board/brya/board.h +++ b/board/brya/board.h @@ -35,6 +35,7 @@ #define GPIO_ENTERING_RW GPIO_EC_ENTERING_RW #define GPIO_KBD_KSO2 GPIO_EC_KSO_02_INV #define GPIO_LID_OPEN GPIO_LID_OPEN_OD +#define GPIO_PCH_PWRBTN_L GPIO_EC_PCH_PWR_BTN_ODL #define GPIO_PCH_RSMRST_L GPIO_EC_PCH_RSMRST_L #define GPIO_PCH_SLP_S0_L GPIO_SYS_SLP_S0IX_L #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L @@ -46,6 +47,7 @@ #define GPIO_PG_EC_ALL_SYS_PWRGD GPIO_SEQ_EC_ALL_SYS_PG #define GPIO_PG_EC_DSW_PWROK GPIO_SEQ_EC_DSW_PWROK #define GPIO_PG_EC_RSMRST_ODL GPIO_SEQ_EC_RSMRST_ODL +#define GPIO_POWER_BUTTON_L GPIO_GSC_EC_PWR_BTN_ODL #define GPIO_RSMRST_L_PGOOD GPIO_SEQ_EC_RSMRST_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_WP_L GPIO_EC_WP_ODL @@ -141,12 +143,6 @@ enum mft_channel { }; /* - * remove when we enable CONFIG_POWER_BUTTON - */ - -void power_button_interrupt(enum gpio_signal signal); - -/* * remove when we enable CONFIG_VOLUME_BUTTONS */ diff --git a/board/brya/ec.tasklist b/board/brya/ec.tasklist index 56cd411da0..4065a63bde 100644 --- a/board/brya/ec.tasklist +++ b/board/brya/ec.tasklist @@ -13,4 +13,5 @@ TASK_NOTEST(CHIPSET, chipset_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_ALWAYS(HOSTCMD, host_command_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_ALWAYS(CONSOLE, console_task, NULL, VENTI_TASK_STACK_SIZE) \ + TASK_ALWAYS(POWERBTN, power_button_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_NOTEST(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) |