From af8559a435e3865dc9704c28459dd01c662f6f64 Mon Sep 17 00:00:00 2001 From: Zick Wei Date: Tue, 26 Apr 2022 16:43:37 +0800 Subject: agah: support vivaldi keyboard BUG=b:231894374 BRANCH=none TEST=make BOARD=agah Signed-off-by: Zick Wei Change-Id: I16c746f7c83506755d04d4b1e109c111641245b9 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3607913 Reviewed-by: Boris Mittelberg --- board/agah/board.h | 5 ----- board/agah/keyboard.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/board/agah/board.h b/board/agah/board.h index ac170dc19c..c82f2d3b16 100644 --- a/board/agah/board.h +++ b/board/agah/board.h @@ -10,11 +10,6 @@ #include "compile_time_macros.h" -/* - * Early agah boards are not set up for vivaldi - */ -#undef CONFIG_KEYBOARD_VIVALDI - /* Baseboard features */ #include "baseboard.h" diff --git a/board/agah/keyboard.c b/board/agah/keyboard.c index a9f033130d..d70c3e1dcf 100644 --- a/board/agah/keyboard.c +++ b/board/agah/keyboard.c @@ -4,7 +4,7 @@ */ #include "common.h" - +#include "ec_commands.h" #include "keyboard_scan.h" #include "timer.h" @@ -23,3 +23,30 @@ __override struct keyboard_scan_config keyscan_config = { 0xa4, 0xff, 0xfe, 0x55, 0xfa, 0xca /* full set */ }, }; + +static const struct ec_response_keybd_config keybd = { + .num_top_row_keys = 13, + .action_keys = { + TK_BACK, /* T1 */ + TK_REFRESH, /* T2 */ + TK_FULLSCREEN, /* T3 */ + TK_OVERVIEW, /* T4 */ + TK_SNAPSHOT, /* T5 */ + TK_BRIGHTNESS_DOWN, /* T6 */ + TK_BRIGHTNESS_UP, /* T7 */ + TK_KBD_BKLIGHT_TOGGLE, /* T8 */ + TK_PLAY_PAUSE, /* T9 */ + TK_MICMUTE, /* T10 */ + TK_VOL_MUTE, /* T11 */ + TK_VOL_DOWN, /* T12 */ + TK_VOL_UP, /* T13 */ + }, + .capabilities = KEYBD_CAP_SCRNLOCK_KEY, +}; + + +__override const struct ec_response_keybd_config * +board_vivaldi_keybd_config(void) +{ + return &keybd; +} -- cgit v1.2.1