common/vivaldi: Revert Vivaldi changes

This reverts the current vivaldi code in favor of the soon-to-be-merged
new vivaldi framework. The current code is enabled on demand as it hides
behind CONFIG_VIVALDI. In its new form, vivaldi shall always be
enabled for all boards, as explained in go/vivaldi-fw-design.

Planning to land new code for Vivaldi in EC, so might be better to
start with clean slate.

BUG=b:146501925
TEST=Build
BRANCH=firmware-hatch-12672.B

Signed-off-by: Rajat Jain <rajatja@google.com>
Change-Id: I1b88d069a265ce59c2c36cf534b740a852745b67
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2133823
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>

2 files changed, 0 insertions, 72 deletions

diff --git a/common/build.mk b/common/build.mk
index 11afd3e7e3..c241a99550 100644
--- a/common/build.mk
+++ b/common/build.mk
@@ -89,7 +89,6 @@ common-$(CONFIG_KEYBOARD_PROTOCOL_8042)+=keyboard_8042.o \
 	keyboard_8042_sharedlib.o
 common-$(CONFIG_KEYBOARD_PROTOCOL_MKBP)+=keyboard_mkbp.o
 common-$(CONFIG_KEYBOARD_TEST)+=keyboard_test.o
-common-$(CONFIG_KEYBOARD_VIVALDI)+=keyboard_vivaldi.o
 common-$(CONFIG_LED_COMMON)+=led_common.o
 common-$(CONFIG_LED_POLICY_STD)+=led_policy_std.o
 common-$(CONFIG_LED_PWM)+=led_pwm.o
diff --git a/common/keyboard_vivaldi.c b/common/keyboard_vivaldi.c
deleted file mode 100644
index 741c15de0f..0000000000
--- a/common/keyboard_vivaldi.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2020 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.
- */
-
-/* Vivali Keyboard code for Chrome EC */
-
-#include "keyboard_8042_sharedlib.h"
-#include "keyboard_scan.h"
-#include "keyboard_vivaldi.h"
-
-/*
- * Row Column info for Top row keys T1 - T15
- * Ref: https://drive.google.com/corp/drive/folders/17UtVQ-AixnlQuicRPTp8t46HE-sT522E
- */
-static const struct key {
-	uint8_t row;
-	uint8_t col;
-} vivaldi[MAX_VIVALDI_KEYS] = {
-	[T1] = {.row = 0, .col = 2},
-	[T2] = {.row = 3, .col = 2},
-	[T3] = {.row = 2, .col = 2},
-	[T4] = {.row = 1, .col = 2},
-	[T5] = {.row = 3, .col = 4},
-	[T6] = {.row = 2, .col = 4},
-	[T7] = {.row = 1, .col = 4},
-	[T8] = {.row = 2, .col = 9},
-	[T9] = {.row = 1, .col = 9},
-	[T10] = {.row = 0, .col = 4},
-	[T11] = {.row = 0, .col = 1},
-	[T12] = {.row = 1, .col = 5},
-	[T13] = {.row = 3, .col = 5},
-	[T14] = {.row = 0, .col = 9},
-	[T15] = {.row = 0, .col = 11},
-};
-
-void vivaldi_init(const struct vivaldi_config *keybd)
-{
-	uint8_t row, col, *mask;
-	int key;
-
-	cprints(CC_KEYBOARD, "VIVALDI: Num top row keys = %u",
-		keybd->num_top_row_keys);
-
-	if (keybd->num_top_row_keys > MAX_VIVALDI_KEYS ||
-	    keybd->num_top_row_keys < 10)
-		cprints(CC_KEYBOARD,
-			"BAD VIVALDI CONFIG! Some keys may not work");
-
-	for (key = T1; key < MAX_VIVALDI_KEYS; key++) {
-
-		row = vivaldi[key].row;
-		col = vivaldi[key].col;
-		mask = keyscan_config.actual_key_mask + col;
-
-		if (key < keybd->num_top_row_keys && keybd->scancodes[key]) {
-
-			/* Enable the mask */
-			*mask |= (1 << row);
-
-			/* Populate the scancode */
-			scancode_set2[col][row] = keybd->scancodes[key];
-			cprints(CC_KEYBOARD,
-				"VIVALDI key-%u (r-%u, c-%u) = scancode-%X",
-				key, row, col, keybd->scancodes[key]);
-		} else {
-			/* Disable the mask */
-			*mask &= ~(1 << row);
-		}
-	}
-}