Delbin-G: Support second keyboard matrix

Support second keyboard.

BUG=b:232737379
BRANCH=firmware-volteer-13672.B
TEST=make BOARD=delbin

Signed-off-by: Jacky_Wang <jacky5_wang@pegatron.corp-partner.google.com>
Change-Id: I4ed722d56969cbfd2cb6009cf5bd17dec9176973
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3676893
Commit-Queue: Kenny Pan <kennypan@google.com>
Reviewed-by: Kenny Pan <kennypan@google.com>
(cherry picked from commit 5b7c2cff927423721922b6a986a3b61f24806886)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3740381

13 files changed, 468 insertions, 3 deletions

diff --git a/baseboard/volteer/cbi_ssfc.c b/baseboard/volteer/cbi_ssfc.c
index 42b11c4a1c..3238cfc933 100644
--- a/baseboard/volteer/cbi_ssfc.c
+++ b/baseboard/volteer/cbi_ssfc.c
@@ -39,3 +39,8 @@ enum ec_ssfc_lightbar get_cbi_ssfc_lightbar(void)
 {
 	return cached_ssfc.lightbar;
 }
+
+enum ec_ssfc_keyboard get_cbi_ssfc_keyboard(void)
+{
+	return cached_ssfc.keyboard;
+}
diff --git a/baseboard/volteer/cbi_ssfc.h b/baseboard/volteer/cbi_ssfc.h
index 27db1d3809..3fe38965e6 100644
--- a/baseboard/volteer/cbi_ssfc.h
+++ b/baseboard/volteer/cbi_ssfc.h
@@ -39,12 +39,22 @@ enum ec_ssfc_lightbar {
 	SSFC_LIGHTBAR_12_LED = 2
 };
 
+/*
+ * Keyboard Type (Bit 11)
+ */
+enum ec_ssfc_keyboard {
+	SSFC_KEYBOARD_DEFAULT = 0,
+	SSFC_KEYBOARD_GAMING = 1
+};
+
 union volteer_cbi_ssfc {
 	struct {
 		enum ec_ssfc_base_sensor base_sensor : 3;
 		enum ec_ssfc_lid_sensor lid_sensor : 3;
 		enum ec_ssfc_lightbar lightbar : 2;
-		uint32_t reserved_2 : 24;
+		uint32_t reserved_2 : 4;
+		enum ec_ssfc_keyboard keyboard : 1;
+		uint32_t reserved_3 : 19;
 	};
 	uint32_t raw_value;
 };
@@ -70,4 +80,11 @@ enum ec_ssfc_lid_sensor get_cbi_ssfc_lid_sensor(void);
  */
 enum ec_ssfc_lightbar get_cbi_ssfc_lightbar(void);
 
+/**
+ * Get keyboard type from SSFC_CONFIG.
+ *
+ * @return the keyboard type.
+ */
+enum ec_ssfc_keyboard get_cbi_ssfc_keyboard(void);
+
 #endif /* _Volteer_CBI_SSFC__H_ */
diff --git a/board/delbin/board.c b/board/delbin/board.c
index b1d7754992..1fe37bc6c3 100644
--- a/board/delbin/board.c
+++ b/board/delbin/board.c
@@ -8,6 +8,7 @@
 #include "common.h"
 #include "accelgyro.h"
 #include "cbi_ec_fw_config.h"
+#include "cbi_ssfc.h"
 #include "driver/accel_bma2x2.h"
 #include "driver/accelgyro_bmi260.h"
 #include "driver/bc12/pi3usb9201.h"
@@ -22,6 +23,7 @@
 #include "gpio.h"
 #include "hooks.h"
 #include "keyboard_scan.h"
+#include "keyboard_customization.h"
 #include "lid_switch.h"
 #include "power.h"
 #include "power_button.h"
@@ -60,6 +62,28 @@ __override struct keyboard_scan_config keyscan_config = {
 	},
 };
 
+__override struct key {
+	uint8_t row;
+	uint8_t col;
+} vivaldi_keys[] = {
+	{.row = 0, .col = 2},	/* T1 */
+	{.row = 3, .col = 2},	/* T2 */
+	{.row = 2, .col = 2},	/* T3 */
+	{.row = 1, .col = 2},	/* T4 */
+	{.row = 3, .col = 4},	/* T5 */
+	{.row = 2, .col = 4},	/* T6 */
+	{.row = 1, .col = 4},	/* T7 */
+	{.row = 2, .col = 9},	/* T8 */
+	{.row = 1, .col = 9},	/* T9 */
+	{.row = 0, .col = 4},	/* T10 */
+	{.row = 0, .col = 1},	/* T11 */
+	{.row = 1, .col = 5},	/* T12 */
+	{.row = 3, .col = 5},	/* T13 */
+	{.row = 0, .col = 9},	/* T14 */
+	{.row = 0, .col = 11},	/* T15 */
+};
+BUILD_ASSERT(ARRAY_SIZE(vivaldi_keys) == MAX_TOP_ROW_KEYS);
+
 /******************************************************************************/
 /*
  * FW_CONFIG defaults for Delbin if the CBI data is not initialized.
@@ -70,8 +94,28 @@ union volteer_cbi_fw_config fw_config_defaults = {
 
 static void board_init(void)
 {
+	key_choose();
+
+	if (get_cbi_ssfc_keyboard() == SSFC_KEYBOARD_GAMING) {
+		keyscan_config.actual_key_mask[1] = 0xfa;
+		keyscan_config.actual_key_mask[4] = 0xfe;
+		keyscan_config.actual_key_mask[7] = 0x86;
+		keyscan_config.actual_key_mask[9] = 0xff;
+		keyscan_config.actual_key_mask[11] = 0xff;
+
+		vivaldi_keys[0].row = 4;
+		vivaldi_keys[0].col = 2;
+		vivaldi_keys[4].row = 4;
+		vivaldi_keys[4].col = 4;
+		vivaldi_keys[5].row = 3;
+		vivaldi_keys[5].col = 4;
+		vivaldi_keys[6].row = 2;
+		vivaldi_keys[6].col = 4;
+		vivaldi_keys[9].row = 1;
+		vivaldi_keys[9].col = 4;
+	}
 }
-DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT);
+DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_PRE_DEFAULT);
 
 /******************************************************************************/
 /* Physical fans. These are logically separate from pwm_channels. */
diff --git a/board/delbin/board.h b/board/delbin/board.h
index 27cff2dde5..f75565c450 100644
--- a/board/delbin/board.h
+++ b/board/delbin/board.h
@@ -39,6 +39,9 @@
 /* Keyboard features */
 #define CONFIG_KEYBOARD_VIVALDI
 #define CONFIG_KEYBOARD_REFRESH_ROW3
+#define CONFIG_KEYBOARD_CUSTOMIZATION
+#define CONFIG_KEYBOARD_MULTIPLE
+
 
 /* Sensors */
 /* BMA253 accelerometer in base */
diff --git a/board/delbin/build.mk b/board/delbin/build.mk
index 66ad809f59..003b3d871d 100644
--- a/board/delbin/build.mk
+++ b/board/delbin/build.mk
@@ -16,3 +16,4 @@ board-y=board.o
 board-y+=battery.o
 board-y+=led.o
 board-y+=sensors.o
+board-$(CONFIG_KEYBOARD_CUSTOMIZATION)+=keyboard_customization.o
diff --git a/board/delbin/keyboard_customization.c b/board/delbin/keyboard_customization.c
new file mode 100644
index 0000000000..bae603ee12
--- /dev/null
+++ b/board/delbin/keyboard_customization.c
@@ -0,0 +1,168 @@
+/* Copyright 2022 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "common.h"
+#include "cbi_ssfc.h"
+#include "gpio.h"
+#include "keyboard_customization.h"
+#include "keyboard_8042_sharedlib.h"
+#include "keyboard_config.h"
+#include "keyboard_protocol.h"
+#include "keyboard_raw.h"
+#include "keyboard_scan.h"
+
+static uint16_t (*scancode_set2)[KEYBOARD_ROWS];
+
+static uint16_t KB2scancode_set2[KEYBOARD_COLS_MAX][KEYBOARD_ROWS] = {
+	{0x0000, 0x0000, 0x0014, 0xe01f, 0xe014, 0x0000, 0x0000, 0x0000},
+	{0x0000, 0x0076, 0x0000, 0x000e, 0x001c, 0x003a, 0x000d, 0x0016},
+	{0x006c, 0x000c, 0x0004, 0x0006, 0x0005, 0xe071, 0x0026, 0x002a},
+	{0x0032, 0x0034, 0x002c, 0x002e, 0x002b, 0x0029, 0x0025, 0x002d},
+	{0xe01f, 0x0009, 0x0083, 0x000b, 0x0003, 0x0041, 0x001e, 0x001d},
+	{0x0051, 0x0000, 0x005b, 0x0000, 0x0042, 0x0022, 0x003e, 0x0043},
+	{0x0031, 0x0033, 0x0035, 0x0036, 0x003b, 0x001b, 0x003d, 0x003c},
+	{0x0000, 0x0012, 0x0061, 0x0000, 0x0000, 0x0000, 0x0000, 0x0059},
+	{0x0055, 0x0052, 0x0054, 0x004e, 0x004c, 0x0024, 0x0044, 0x004d},
+	{0x0045, 0x0001, 0x000a, 0x002f, 0x004b, 0x0049, 0x0046, 0x001a},
+	{0xe011, 0x0000, 0x006a, 0x0000, 0x005d, 0x0000, 0x0011, 0x0000},
+	{0xe07a, 0x005d, 0xe075, 0x006b, 0x005a, 0xe072, 0x004a, 0x0066},
+	{0xe06b, 0xe074, 0xe069, 0x0067, 0xe06c, 0x0064, 0x0015, 0xe07d},
+	{0x0073, 0x007c, 0x007b, 0x0074, 0x0071, 0xe04a, 0x0070, 0x0021},
+	{0x0023, 0x005a, 0x0075, 0x0079, 0x007a, 0x0072, 0x007D, 0x0069},
+};
+
+/* The standard Chrome OS keyboard matrix table in scan code set 2. */
+static uint16_t KB1scancode_set2[KEYBOARD_COLS_MAX][KEYBOARD_ROWS] = {
+	{0x0000, 0x0000, 0x0014, 0xe01f, 0xe014, 0xe007, 0x0000, 0x0000},
+	{0xe01f, 0x0076, 0x000d, 0x000e, 0x001c, 0x001a, 0x0016, 0x0015},
+	{0x0005, 0x000c, 0x0004, 0x0006, 0x0023, 0x0021, 0x0026, 0x0024},
+	{0x0032, 0x0034, 0x002c, 0x002e, 0x002b, 0x002a, 0x0025, 0x002d},
+	{0x0009, 0x0083, 0x000b, 0x0003, 0x001b, 0x0022, 0x001e, 0x001d},
+	{0x0051, 0x0000, 0x005b, 0x0000, 0x0042, 0x0041, 0x003e, 0x0043},
+	{0x0031, 0x0033, 0x0035, 0x0036, 0x003b, 0x003a, 0x003d, 0x003c},
+	{0x0000, 0x0000, 0x0061, 0x0000, 0x0000, 0x0012, 0x0000, 0x0059},
+	{0x0055, 0x0052, 0x0054, 0x004e, 0x004c, 0x004a, 0x0045, 0x004d},
+	{0x0000, 0x0001, 0x000a, 0x002f, 0x004b, 0x0049, 0x0046, 0x0044},
+	{0xe011, 0x0000, 0x006a, 0x0000, 0x005d, 0x0000, 0x0011, 0x0000},
+#ifndef CONFIG_KEYBOARD_KEYPAD
+	{0x0000, 0x0066, 0x0000, 0x005d, 0x005a, 0x0029, 0xe072, 0xe075},
+	{0x0000, 0x0064, 0x0000, 0x0067, 0x0000, 0x0000, 0xe074, 0xe06b},
+#else
+	{0x0000, 0x0066, 0xe071, 0x005d, 0x005a, 0x0029, 0xe072, 0xe075},
+	{0xe06c, 0x0064, 0xe07d, 0x0067, 0xe069, 0xe07a, 0xe074, 0xe06b},
+	{0xe04a, 0x007c, 0x007b, 0x0074, 0x0071, 0x0073, 0x006b, 0x0070},
+	{0x006c, 0x0075, 0x007d, 0x0079, 0x007a, 0x0072, 0x0069, 0xe05a},
+#endif
+};
+
+uint16_t get_scancode_set2(uint8_t row, uint8_t col)
+{
+	if (col < KEYBOARD_COLS_MAX && row < KEYBOARD_ROWS)
+		return *(*(scancode_set2 + col)+row);
+
+	return 0;
+}
+
+void set_scancode_set2(uint8_t row, uint8_t col, uint16_t val)
+{
+	if (col < KEYBOARD_COLS_MAX && row < KEYBOARD_ROWS)
+		*(*(scancode_set2 + col)+row) = val;
+}
+
+void board_keyboard_drive_col(int col)
+{
+	/* Drive all lines to high */
+	if (col == KEYBOARD_COLUMN_NONE)
+		gpio_set_level(GPIO_KBD_KSO2, 0);
+
+	/* Set KBSOUT to zero to detect key-press */
+	else if (col == KEYBOARD_COLUMN_ALL)
+		gpio_set_level(GPIO_KBD_KSO2, 1);
+
+	/* Drive one line for detection */
+	else {
+		if (col == 2)
+			gpio_set_level(GPIO_KBD_KSO2, 1);
+		else
+			gpio_set_level(GPIO_KBD_KSO2, 0);
+	}
+}
+
+struct keyboard_type key_typ = {
+	.col_esc = KEYBOARD_COL_ESC,
+	.row_esc = KEYBOARD_ROW_ESC,
+	.col_down = KEYBOARD_COL_DOWN,
+	.row_down = KEYBOARD_ROW_DOWN,
+	.col_left_shift = KEYBOARD_COL_LEFT_SHIFT,
+	.row_left_shift = KEYBOARD_ROW_LEFT_SHIFT,
+	.col_refresh = KEYBOARD_COL_REFRESH,
+	.row_refresh = KEYBOARD_ROW_REFRESH,
+	.col_right_alt = KEYBOARD_COL_RIGHT_ALT,
+	.row_right_alt = KEYBOARD_ROW_RIGHT_ALT,
+	.col_left_alt = KEYBOARD_COL_LEFT_ALT,
+	.row_left_alt = KEYBOARD_ROW_LEFT_ALT,
+	.col_key_r = KEYBOARD_COL_KEY_R,
+	.row_key_r = KEYBOARD_ROW_KEY_R,
+	.col_key_h = KEYBOARD_COL_KEY_H,
+	.row_key_h = KEYBOARD_ROW_KEY_H,
+};
+
+int keyboard_choose(void)
+{
+	if (get_cbi_ssfc_keyboard() == SSFC_KEYBOARD_GAMING)
+		return 1;
+
+	return 0;
+}
+
+void key_choose(void)
+{
+	if (keyboard_choose() == 1) {
+		key_typ.col_esc = KEYBOARD2_COL_ESC;
+		key_typ.row_esc = KEYBOARD2_ROW_ESC;
+		key_typ.col_down = KEYBOARD2_COL_DOWN;
+		key_typ.row_down = KEYBOARD2_ROW_DOWN;
+		key_typ.col_left_shift = KEYBOARD2_COL_LEFT_SHIFT;
+		key_typ.row_left_shift = KEYBOARD2_ROW_LEFT_SHIFT;
+		key_typ.col_refresh = KEYBOARD2_COL_REFRESH;
+		key_typ.row_refresh = KEYBOARD2_ROW_REFRESH;
+		key_typ.col_right_alt = KEYBOARD2_COL_RIGHT_ALT;
+		key_typ.row_right_alt = KEYBOARD2_ROW_RIGHT_ALT;
+		key_typ.col_left_alt = KEYBOARD2_COL_LEFT_ALT;
+		key_typ.row_left_alt = KEYBOARD2_ROW_LEFT_ALT;
+		key_typ.col_key_r = KEYBOARD2_COL_KEY_R;
+		key_typ.row_key_r = KEYBOARD2_ROW_KEY_R;
+		key_typ.col_key_h = KEYBOARD2_COL_KEY_H;
+		key_typ.row_key_h = KEYBOARD2_ROW_KEY_H;
+
+		boot_key_list[0].col = KEYBOARD2_COL_ESC;
+		boot_key_list[0].row = KEYBOARD2_ROW_ESC;
+		boot_key_list[1].col = KEYBOARD2_COL_DOWN;
+		boot_key_list[1].row = KEYBOARD2_ROW_DOWN;
+		boot_key_list[2].col = KEYBOARD2_COL_LEFT_SHIFT;
+		boot_key_list[2].row = KEYBOARD2_ROW_LEFT_SHIFT;
+
+		scancode_set2 = KB2scancode_set2;
+	} else {
+		key_typ.col_esc = KEYBOARD_COL_ESC;
+		key_typ.row_esc = KEYBOARD_ROW_ESC;
+		key_typ.col_down = KEYBOARD_COL_DOWN;
+		key_typ.row_down = KEYBOARD_ROW_DOWN;
+		key_typ.col_left_shift = KEYBOARD_COL_LEFT_SHIFT;
+		key_typ.row_left_shift = KEYBOARD_ROW_LEFT_SHIFT;
+		key_typ.col_refresh = KEYBOARD_COL_REFRESH;
+		key_typ.row_refresh = KEYBOARD_ROW_REFRESH;
+		key_typ.col_right_alt = KEYBOARD_COL_RIGHT_ALT;
+		key_typ.row_right_alt = KEYBOARD_ROW_RIGHT_ALT;
+		key_typ.col_left_alt = KEYBOARD_COL_LEFT_ALT;
+		key_typ.row_left_alt = KEYBOARD_ROW_LEFT_ALT;
+		key_typ.col_key_r = KEYBOARD_COL_KEY_R;
+		key_typ.row_key_r = KEYBOARD_ROW_KEY_R;
+		key_typ.col_key_h = KEYBOARD_COL_KEY_H;
+		key_typ.row_key_h = KEYBOARD_ROW_KEY_H;
+
+		scancode_set2 = KB1scancode_set2;
+	}
+}
diff --git a/board/delbin/keyboard_customization.h b/board/delbin/keyboard_customization.h
new file mode 100644
index 0000000000..5fe6b285de
--- /dev/null
+++ b/board/delbin/keyboard_customization.h
@@ -0,0 +1,130 @@
+/* Copyright 2022 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* Keyboard configuration */
+
+#ifndef __KEYBOARD_CUSTOMIZATION_H
+#define __KEYBOARD_CUSTOMIZATION_H
+
+/*
+ * KEYBOARD_COLS_MAX has the build time column size. It's used to allocate
+ * exact spaces for arrays. Actual keyboard scanning is done using
+ * keyboard_cols, which holds a runtime column size.
+ */
+#define KEYBOARD_COLS_MAX 16
+#define KEYBOARD_ROWS 8
+
+/*
+ * WARNING: Do not directly modify it. You should call keyboard_raw_set_cols,
+ * instead. It checks whether you're eligible or not.
+ */
+extern uint8_t keyboard_cols;
+
+#define KEYBOARD_ROW_TO_MASK(r) (1 << (r))
+
+#define KEYBOARD_COL_DOWN 11
+#define KEYBOARD_ROW_DOWN 6
+#define KEYBOARD_MASK_DOWN KEYBOARD_ROW_TO_MASK(KEYBOARD_ROW_DOWN)
+#define KEYBOARD_COL_ESC 1
+#define KEYBOARD_ROW_ESC 1
+#define KEYBOARD_MASK_ESC KEYBOARD_ROW_TO_MASK(KEYBOARD_ROW_ESC)
+#define KEYBOARD_COL_KEY_H 6
+#define KEYBOARD_ROW_KEY_H 1
+#define KEYBOARD_MASK_KEY_H KEYBOARD_ROW_TO_MASK(KEYBOARD_ROW_KEY_H)
+#define KEYBOARD_COL_KEY_R 3
+#define KEYBOARD_ROW_KEY_R 7
+#define KEYBOARD_MASK_KEY_R KEYBOARD_ROW_TO_MASK(KEYBOARD_ROW_KEY_R)
+#define KEYBOARD_COL_LEFT_ALT 10
+#define KEYBOARD_ROW_LEFT_ALT 6
+#define KEYBOARD_MASK_LEFT_ALT KEYBOARD_ROW_TO_MASK(KEYBOARD_ROW_LEFT_ALT)
+#define KEYBOARD_COL_REFRESH 2
+#ifdef CONFIG_KEYBOARD_REFRESH_ROW3
+#define KEYBOARD_ROW_REFRESH 3
+#else
+#define KEYBOARD_ROW_REFRESH 2
+#endif
+#define KEYBOARD_MASK_REFRESH KEYBOARD_ROW_TO_MASK(KEYBOARD_ROW_REFRESH)
+#define KEYBOARD_COL_RIGHT_ALT 10
+#define KEYBOARD_ROW_RIGHT_ALT 0
+#define KEYBOARD_MASK_RIGHT_ALT KEYBOARD_ROW_TO_MASK(KEYBOARD_ROW_RIGHT_ALT)
+#define KEYBOARD_DEFAULT_COL_VOL_UP 4
+#define KEYBOARD_DEFAULT_ROW_VOL_UP 0
+#define KEYBOARD_COL_LEFT_CTRL 0
+#define KEYBOARD_ROW_LEFT_CTRL 2
+#define KEYBOARD_MASK_LEFT_CTRL KEYBOARD_ROW_TO_MASK(KEYBOARD_ROW_LEFT_CTRL)
+#define KEYBOARD_COL_RIGHT_CTRL 0
+#define KEYBOARD_ROW_RIGHT_CTRL 4
+#define KEYBOARD_MASK_RIGHT_CTRL KEYBOARD_ROW_TO_MASK(KEYBOARD_ROW_RIGHT_CTRL)
+#define KEYBOARD_COL_SEARCH 1
+#define KEYBOARD_ROW_SEARCH 0
+#define KEYBOARD_MASK_SEARCH KEYBOARD_ROW_TO_MASK(KEYBOARD_ROW_SEARCH)
+#define KEYBOARD_COL_KEY_0 8
+#define KEYBOARD_ROW_KEY_0 6
+#define KEYBOARD_MASK_KEY_0 KEYBOARD_ROW_TO_MASK(KEYBOARD_ROW_KEY_0)
+#define KEYBOARD_COL_KEY_1 1
+#define KEYBOARD_ROW_KEY_1 6
+#define KEYBOARD_MASK_KEY_1 KEYBOARD_ROW_TO_MASK(KEYBOARD_ROW_KEY_1)
+#define KEYBOARD_COL_KEY_2 4
+#define KEYBOARD_ROW_KEY_2 6
+#define KEYBOARD_MASK_KEY_2 KEYBOARD_ROW_TO_MASK(KEYBOARD_ROW_KEY_2)
+#define KEYBOARD_COL_LEFT_SHIFT 7
+#define KEYBOARD_ROW_LEFT_SHIFT 5
+#define KEYBOARD_MASK_LEFT_SHIFT KEYBOARD_ROW_TO_MASK(KEYBOARD_ROW_LEFT_SHIFT)
+#ifdef CONFIG_KEYBOARD_PWRBTN_ASSERTS_KSI2
+#define KEYBOARD_MASK_PWRBTN KEYBOARD_ROW_TO_MASK(2)
+#elif defined(CONFIG_KEYBOARD_PWRBTN_ASSERTS_KSI3)
+#define KEYBOARD_MASK_PWRBTN KEYBOARD_ROW_TO_MASK(3)
+#endif
+
+/* Columns and masks for keys we particularly care about */
+#define KEYBOARD2_COL_DOWN 11
+#define KEYBOARD2_ROW_DOWN 5
+#define KEYBOARD2_MASK_DOWN KEYBOARD_ROW_TO_MASK(KEYBOARD2_ROW_DOWN)
+#define KEYBOARD2_COL_ESC 1
+#define KEYBOARD2_ROW_ESC 1
+#define KEYBOARD2_MASK_ESC KEYBOARD_ROW_TO_MASK(KEYBOARD2_ROW_ESC)
+#define KEYBOARD2_COL_KEY_H 6
+#define KEYBOARD2_ROW_KEY_H 1
+#define KEYBOARD2_MASK_KEY_H KEYBOARD_ROW_TO_MASK(KEYBOARD2_ROW_KEY_H)
+#define KEYBOARD2_COL_KEY_R 3
+#define KEYBOARD2_ROW_KEY_R 7
+#define KEYBOARD2_MASK_KEY_R KEYBOARD_ROW_TO_MASK(KEYBOARD2_ROW_KEY_R)
+#define KEYBOARD2_COL_LEFT_ALT 10
+#define KEYBOARD2_ROW_LEFT_ALT 6
+#define KEYBOARD2_MASK_LEFT_ALT KEYBOARD_ROW_TO_MASK(KEYBOARD2_ROW_LEFT_ALT)
+#define KEYBOARD2_COL_REFRESH  2
+#define KEYBOARD2_ROW_REFRESH  3
+#define KEYBOARD2_MASK_REFRESH KEYBOARD_ROW_TO_MASK(KEYBOARD2_ROW_REFRESH)
+#define KEYBOARD2_COL_RIGHT_ALT 10
+#define KEYBOARD2_ROW_RIGHT_ALT 0
+#define KEYBOARD2_MASK_RIGHT_ALT KEYBOARD_ROW_TO_MASK(KEYBOARD2_ROW_RIGHT_ALT)
+#define KEYBOARD2_DEFAULT_COL_VOL_UP 4
+#define KEYBOARD2_DEFAULT_ROW_VOL_UP 1
+#define KEYBOARD2_COL_LEFT_CTRL 0
+#define KEYBOARD2_ROW_LEFT_CTRL 2
+#define KEYBOARD2_MASK_LEFT_CTRL KEYBOARD_ROW_TO_MASK(KEYBOARD2_ROW_LEFT_CTRL)
+#define KEYBOARD2_COL_RIGHT_CTRL 0
+#define KEYBOARD2_ROW_RIGHT_CTRL 4
+#define KEYBOARD2_MASK_RIGHT_CTRL KEYBOARD_ROW_TO_MASK(KEYBOARD2_ROW_RIGHT_CTRL)
+#define KEYBOARD2_COL_SEARCH 4
+#define KEYBOARD2_ROW_SEARCH 0
+#define KEYBOARD2_MASK_SEARCH KEYBOARD_ROW_TO_MASK(KEYBOARD2_ROW_SEARCH)
+#define KEYBOARD2_COL_KEY_0 9
+#define KEYBOARD2_ROW_KEY_0 0
+#define KEYBOARD2_MASK_KEY_0 KEYBOARD_ROW_TO_MASK(KEYBOARD2_ROW_KEY_0)
+#define KEYBOARD2_COL_KEY_1 1
+#define KEYBOARD2_ROW_KEY_1 7
+#define KEYBOARD2_MASK_KEY_1 KEYBOARD_ROW_TO_MASK(KEYBOARD2_ROW_KEY_1)
+#define KEYBOARD2_COL_KEY_2 4
+#define KEYBOARD2_ROW_KEY_2 6
+#define KEYBOARD2_MASK_KEY_2 KEYBOARD_ROW_TO_MASK(KEYBOARD2_ROW_KEY_2)
+#define KEYBOARD2_COL_LEFT_SHIFT 7
+#define KEYBOARD2_ROW_LEFT_SHIFT 1
+#define KEYBOARD2_MASK_LEFT_SHIFT KEYBOARD_ROW_TO_MASK(KEYBOARD2_ROW_LEFT_SHIFT)
+
+int keyboard_choose(void);
+void key_choose(void);
+
+#endif /* __KEYBOARD_CUSTOMIZATION_H */
diff --git a/common/keyboard_scan.c b/common/keyboard_scan.c
index a1e17bc61d..a94ed6636f 100644
--- a/common/keyboard_scan.c
+++ b/common/keyboard_scan.c
@@ -26,6 +26,10 @@
 #include "usb_api.h"
 #include "util.h"
 
+#ifdef CONFIG_KEYBOARD_MULTIPLE
+#include "keyboard_customization.h"
+#endif
+
 /* Console output macros */
 #define CPUTS(outstr) cputs(CC_KEYSCAN, outstr)
 #define CPRINTF(format, args...) cprintf(CC_KEYSCAN, format, ## args)
@@ -78,17 +82,27 @@ __overridable struct keyboard_scan_config keyscan_config = {
 };
 
 /* Boot key list.  Must be in same order as enum boot_key. */
+#ifndef CONFIG_KEYBOARD_MULTIPLE
 struct boot_key_entry {
 	uint8_t mask_index;
 	uint8_t mask_value;
 };
+#endif
 
 #ifdef CONFIG_KEYBOARD_BOOT_KEYS
+#ifndef CONFIG_KEYBOARD_MULTIPLE
 static const struct boot_key_entry boot_key_list[] = {
 	{KEYBOARD_COL_ESC, KEYBOARD_MASK_ESC},   /* Esc */
 	{KEYBOARD_COL_DOWN, KEYBOARD_MASK_DOWN}, /* Down-arrow */
 	{KEYBOARD_COL_LEFT_SHIFT, KEYBOARD_MASK_LEFT_SHIFT}, /* Left-Shift */
 };
+#else
+struct boot_key_entry boot_key_list[] = {
+	{KEYBOARD_COL_ESC, KEYBOARD_ROW_ESC},   /* Esc */
+	{KEYBOARD_COL_DOWN, KEYBOARD_ROW_DOWN}, /* Down-arrow */
+	{KEYBOARD_COL_LEFT_SHIFT, KEYBOARD_ROW_LEFT_SHIFT}, /* Left-Shift */
+};
+#endif
 static uint32_t boot_key_value = BOOT_KEY_NONE;
 #endif
 
@@ -424,9 +438,15 @@ static int check_runtime_keys(const uint8_t *state)
 	if (state[key_vol_up_col] != KEYBOARD_ROW_TO_MASK(key_vol_up_row))
 		return 0;
 
+	#ifndef CONFIG_KEYBOARD_MULTIPLE
 	if (state[KEYBOARD_COL_RIGHT_ALT] != KEYBOARD_MASK_RIGHT_ALT &&
 	    state[KEYBOARD_COL_LEFT_ALT] != KEYBOARD_MASK_LEFT_ALT)
 		return 0;
+	#else
+	if (state[key_typ.col_right_alt] != KEYBOARD_MASK_RIGHT_ALT &&
+	    state[key_typ.col_left_alt] != KEYBOARD_MASK_LEFT_ALT)
+		return 0;
+	#endif
 
 	/*
 	 * Count number of columns with keys pressed.  We know two columns are
@@ -441,6 +461,7 @@ static int check_runtime_keys(const uint8_t *state)
 	if (num_press != 3)
 		return 0;
 
+	#ifndef CONFIG_KEYBOARD_MULTIPLE
 	/* Check individual keys */
 	if (state[KEYBOARD_COL_KEY_R] == KEYBOARD_MASK_KEY_R) {
 		/* R = reboot */
@@ -454,6 +475,21 @@ static int check_runtime_keys(const uint8_t *state)
 		system_enter_hibernate(0, 0);
 		return 1;
 	}
+	#else
+	/* Check individual keys */
+	if (state[key_typ.col_key_r] == KEYBOARD_MASK_KEY_R) {
+		/* R = reboot */
+		CPRINTS("KB warm reboot");
+		keyboard_clear_buffer();
+		chipset_reset(CHIPSET_RESET_KB_WARM_REBOOT);
+		return 1;
+	} else if (state[key_typ.col_key_h] == KEYBOARD_MASK_KEY_H) {
+		/* H = hibernate */
+		CPRINTS("KB hibernate");
+		system_enter_hibernate(0, 0);
+		return 1;
+	}
+	#endif
 
 	return 0;
 }
@@ -665,16 +701,30 @@ static uint32_t check_key_list(const uint8_t *state)
 			curr_state[c] &= ~KEYBOARD_MASK_PWRBTN;
 #endif
 
+	#ifndef CONFIG_KEYBOARD_MULTIPLE
 	curr_state[KEYBOARD_COL_REFRESH] &= ~keyboard_mask_refresh;
+	#else
+	curr_state[key_typ.col_refresh] &= ~keyboard_mask_refresh;
+	#endif
 
 	/* Update mask with all boot keys that were pressed. */
 	k = boot_key_list;
+
+	#ifndef CONFIG_KEYBOARD_MULTIPLE
 	for (c = 0; c < ARRAY_SIZE(boot_key_list); c++, k++) {
 		if (curr_state[k->mask_index] & k->mask_value) {
 			boot_key_mask |= BIT(c);
 			curr_state[k->mask_index] &= ~k->mask_value;
 		}
 	}
+	#else
+	for (c = 0; c < ARRAY_SIZE(boot_key_list); c++, k++) {
+		if (curr_state[k->col] & BIT(k->row)) {
+			boot_key_mask |= BIT(c);
+			curr_state[k->col] &= ~BIT(k->row);
+		}
+	}
+	#endif
 
 	/* If any other key was pressed, ignore all boot keys. */
 	for (c = 0; c < keyboard_cols; c++) {
@@ -706,9 +756,15 @@ static uint32_t check_boot_key(const uint8_t *state)
 		return BOOT_KEY_NONE;
 
 	/* If reset was not caused by reset pin, refresh must be held down */
+	#ifndef CONFIG_KEYBOARD_MULTIPLE
 	if (!(system_get_reset_flags() & EC_RESET_FLAG_RESET_PIN) &&
 	    !(state[KEYBOARD_COL_REFRESH] & keyboard_mask_refresh))
 		return BOOT_KEY_NONE;
+	#else
+	if (!(system_get_reset_flags() & EC_RESET_FLAG_RESET_PIN) &&
+	    !(state[key_typ.col_refresh] & keyboard_mask_refresh))
+		return BOOT_KEY_NONE;
+	#endif
 
 	return check_key_list(state);
 }
diff --git a/common/keyboard_vivaldi.c b/common/keyboard_vivaldi.c
index 6a614ef87b..b82973644e 100644
--- a/common/keyboard_vivaldi.c
+++ b/common/keyboard_vivaldi.c
@@ -20,7 +20,7 @@
  * Row Column info for Top row keys T1 - T15. This has been sourced from
  * go/vivaldi-matrix (internal link for vivaldi scan matrix spec).
  */
-static const struct key {
+__overridable const struct key {
 	uint8_t row;
 	uint8_t col;
 } vivaldi_keys[] = {
diff --git a/include/config.h b/include/config.h
index 4eec96f6a8..897ab27b50 100644
--- a/include/config.h
+++ b/include/config.h
@@ -2760,6 +2760,11 @@
 #undef CONFIG_KEYBOARD_CUSTOMIZATION
 
 /*
+ * Allow support multiple keyboard matrix for speical key.
+ */
+#undef CONFIG_KEYBOARD_MULTIPLE
+
+/*
  * Allow board-specific 8042 keyboard callback when a key state is changed.
  */
 #undef CONFIG_KEYBOARD_SCANCODE_CALLBACK
diff --git a/include/hooks.h b/include/hooks.h
index 5210b462df..00e6cd3704 100644
--- a/include/hooks.h
+++ b/include/hooks.h
@@ -14,6 +14,7 @@ enum hook_priority {
 	/* Generic values across all hooks */
 	HOOK_PRIO_FIRST = 1,       /* Highest priority */
 	HOOK_PRIO_DEFAULT = 5000,  /* Default priority */
+	HOOK_PRIO_PRE_DEFAULT = HOOK_PRIO_DEFAULT - 1,
 	HOOK_PRIO_LAST = 9999,     /* Lowest priority */
 
 	/* Specific hook vales for HOOK_INIT */
diff --git a/include/keyboard_scan.h b/include/keyboard_scan.h
index b3a7bed587..8c3837f808 100644
--- a/include/keyboard_scan.h
+++ b/include/keyboard_scan.h
@@ -34,6 +34,15 @@ struct keyboard_scan_config {
 	uint8_t actual_key_mask[KEYBOARD_COLS_MAX];
 };
 
+#ifdef CONFIG_KEYBOARD_MULTIPLE
+/* Boot key list.  Must be in same order as enum boot_key. */
+struct boot_key_entry {
+	uint8_t col;
+	uint8_t row;
+};
+#endif
+
+
 /**
  * Initializes the module.
  */
@@ -144,5 +153,30 @@ extern const int keyboard_factory_scan_pins[][2];
 extern const int keyboard_factory_scan_pins_used;
 #endif
 
+#ifdef CONFIG_KEYBOARD_MULTIPLE
+extern struct boot_key_entry boot_key_list[3];
+
+struct keyboard_type {
+	int col_esc;
+	int row_esc;
+	int col_down;
+	int row_down;
+	int col_left_shift;
+	int row_left_shift;
+	int col_refresh;
+	int row_refresh;
+	int col_right_alt;
+	int row_right_alt;
+	int col_left_alt;
+	int row_left_alt;
+	int col_key_r;
+	int row_key_r;
+	int col_key_h;
+	int row_key_h;
+};
+
+extern struct keyboard_type key_typ;
+#endif
+
 
 #endif  /* __CROS_EC_KEYBOARD_SCAN_H */
diff --git a/util/config_allowed.txt b/util/config_allowed.txt
index 983d3fe623..7adc8d69c3 100644
--- a/util/config_allowed.txt
+++ b/util/config_allowed.txt
@@ -605,6 +605,7 @@ CONFIG_KEYBOARD_IRQ_GPIO
 CONFIG_KEYBOARD_KSO_BASE
 CONFIG_KEYBOARD_KSO_HIGH_DRIVE
 CONFIG_KEYBOARD_LANGUAGE_ID
+CONFIG_KEYBOARD_MULTIPLE
 CONFIG_KEYBOARD_NOT_RAW
 CONFIG_KEYBOARD_POST_SCAN_CLOCKS
 CONFIG_KEYBOARD_PRINT_SCAN_TIMES