summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaveh Jalali <caveh@chromium.org>2021-02-22 16:34:27 -0800
committerCommit Bot <commit-bot@chromium.org>2021-02-24 23:52:38 +0000
commit7a401a50478315bc37d84124f01b86b60fe8db22 (patch)
tree76167eb90737098bf6f8d04737bd1a6dcbfe2b46
parentae11458164b09e74ba2bc085785d49a6ecb90f69 (diff)
downloadchrome-ec-7a401a50478315bc37d84124f01b86b60fe8db22.tar.gz
brya: set up non-vivaldi keyboard layout
This configures the brya keyboard layout support to match early boards. These boards set up for a non-vivaldi layout. BRANCH=none BUG=b:180973324 TEST=tested all keys Change-Id: I856c87c34db3dfda647de88577655b865f97ab93 Signed-off-by: Caveh Jalali <caveh@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2713939 Commit-Queue: Keith Short <keithshort@chromium.org> Reviewed-by: Keith Short <keithshort@chromium.org>
-rw-r--r--baseboard/brya/baseboard.h12
-rw-r--r--board/brya/board.h5
2 files changed, 17 insertions, 0 deletions
diff --git a/baseboard/brya/baseboard.h b/baseboard/brya/baseboard.h
index ceb2e2a54e..4d1b20c04f 100644
--- a/baseboard/brya/baseboard.h
+++ b/baseboard/brya/baseboard.h
@@ -24,6 +24,18 @@
#define CONFIG_EXTPOWER_GPIO
+/* Common Keyboard Defines */
+#define CONFIG_CMD_KEYBOARD
+#define CONFIG_KEYBOARD_BOARD_CONFIG
+#define CONFIG_KEYBOARD_COL2_INVERTED
+#define CONFIG_KEYBOARD_KEYPAD
+#define CONFIG_KEYBOARD_PROTOCOL_8042
+#ifdef CONFIG_KEYBOARD_VIVALDI
+#define CONFIG_KEYBOARD_PWRBTN_ASSERTS_KSI2
+#else
+#define CONFIG_KEYBOARD_PWRBTN_ASSERTS_KSI3
+#endif
+
/* Host communication */
#define CONFIG_HOSTCMD_ESPI
#define CONFIG_HOSTCMD_ESPI_VW_SLP_S4
diff --git a/board/brya/board.h b/board/brya/board.h
index d5e1b23d70..793c02aba3 100644
--- a/board/brya/board.h
+++ b/board/brya/board.h
@@ -8,6 +8,11 @@
#ifndef __CROS_EC_BOARD_H
#define __CROS_EC_BOARD_H
+/*
+ * Early brya boards are not set up for vivaldi
+ */
+#undef CONFIG_KEYBOARD_VIVALDI
+
/* Baseboard features */
#include "baseboard.h"