scarlet: remove keyboard task/code

BUG=chrome-os-partner:62207
BRANCH=gru
TEST=make BOARD=scarlet

Change-Id: I5f89fd526e96d55ed3902af169de5fd14cb8c0c2
Reviewed-on: https://chromium-review.googlesource.com/433085
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Shawn N <shawnn@chromium.org>
Commit-Queue: Philip Chen <philipchen@chromium.org>
Tested-by: Philip Chen <philipchen@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/524975
Commit-Ready: Philip Chen <philipchen@chromium.org>
Reviewed-by: Philip Chen <philipchen@chromium.org>

4 files changed, 0 insertions, 52 deletions

diff --git a/board/scarlet/board.c b/board/scarlet/board.c
index 2886a563f0..4d6d25a7be 100644
--- a/board/scarlet/board.c
+++ b/board/scarlet/board.c
@@ -23,7 +23,6 @@
 #include "hooks.h"
 #include "host_command.h"
 #include "i2c.h"
-#include "keyboard_scan.h"
 #include "lid_switch.h"
 #include "power.h"
 #include "power_button.h"
@@ -127,20 +126,6 @@ const enum gpio_signal hibernate_wake_pins[] = {
 const int hibernate_wake_pins_used = ARRAY_SIZE(hibernate_wake_pins);
 
 /******************************************************************************/
-/* Keyboard scan setting */
-struct keyboard_scan_config keyscan_config = {
-	.output_settle_us = 60,
-	.debounce_down_us = 6 * MSEC,
-	.debounce_up_us = 30 * MSEC,
-	.scan_period_us = 1500,
-	.min_post_scan_delay_us = 1000,
-	.poll_timeout_us = SECOND,
-	.actual_key_mask = {
-		0x14, 0xff, 0xff, 0xff, 0xff, 0xf5, 0xff,
-		0xa4, 0xff, 0xfe, 0x55, 0xfa, 0xc8  /* full set with lock key */
-	},
-};
-
 const struct button_config buttons[CONFIG_BUTTON_COUNT] = {
 	{"Volume Down", KEYBOARD_BUTTON_VOLUME_DOWN, GPIO_VOLUME_DOWN_L,
 	 30 * MSEC, 0},
@@ -531,25 +516,6 @@ struct motion_sensor_t motion_sensors[] = {
 const unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors);
 #endif /* defined(HAS_TASK_MOTIONSENSE) */
 
-#ifndef TEST_BUILD
-void lid_angle_peripheral_enable(int enable)
-{
-	int chipset_in_s0 = chipset_in_state(CHIPSET_STATE_ON);
-
-	if (enable) {
-		keyboard_scan_enable(1, KB_SCAN_DISABLE_LID_ANGLE);
-	} else {
-		/*
-		 * Ensure that the chipset is off before disabling the keyboard.
-		 * When the chipset is on, the EC keeps the keyboard enabled and
-		 * the AP decides whether to ignore input devices or not.
-		 */
-		if (!chipset_in_s0)
-			keyboard_scan_enable(0, KB_SCAN_DISABLE_LID_ANGLE);
-	}
-}
-#endif
-
 static void usb_charge_resume(void)
 {
 	/* Turn on USB-A ports on as we go into S0 from S3. */
diff --git a/board/scarlet/board.h b/board/scarlet/board.h
index c3922d1656..1e7ab8cffb 100644
--- a/board/scarlet/board.h
+++ b/board/scarlet/board.h
@@ -57,10 +57,6 @@
 /* By default, set hcdebug to off */
 #undef CONFIG_HOSTCMD_DEBUG_MODE
 #define CONFIG_HOSTCMD_DEBUG_MODE HCDEBUG_OFF
-#define CONFIG_KEYBOARD_BOARD_CONFIG
-#define CONFIG_KEYBOARD_COL2_INVERTED
-#define CONFIG_KEYBOARD_PROTOCOL_MKBP /* Instead of 8042 protocol of keyboard */
-#define CONFIG_KEYBOARD_PWRBTN_ASSERTS_KSI2
 #define CONFIG_LTO
 #define CONFIG_POWER_BUTTON
 #define CONFIG_POWER_TRACK_HOST_SLEEP_STATE
diff --git a/board/scarlet/ec.tasklist b/board/scarlet/ec.tasklist
index 3b2217ea07..2dba978535 100644
--- a/board/scarlet/ec.tasklist
+++ b/board/scarlet/ec.tasklist
@@ -25,6 +25,5 @@
 	TASK_NOTEST(PDCMD, pd_command_task, NULL, LARGER_TASK_STACK_SIZE) \
 	TASK_ALWAYS(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
 	TASK_ALWAYS(CONSOLE, console_task, NULL, LARGER_TASK_STACK_SIZE) \
-	TASK_NOTEST(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \
 	TASK_ALWAYS(PD_C0, pd_task, NULL, LARGER_TASK_STACK_SIZE)
 
diff --git a/board/scarlet/gpio.inc b/board/scarlet/gpio.inc
index bfc07e0f0d..9f227b08f6 100644
--- a/board/scarlet/gpio.inc
+++ b/board/scarlet/gpio.inc
@@ -88,9 +88,6 @@ GPIO(I2C3_SDA,             PIN(D, 0), GPIO_ODR_HIGH)
 /* Attached to push-pull interrupt pin of accel, but unused */
 GPIO(LID_ACCEL_INT_L,      PIN(C, 7), GPIO_INPUT)
 
-/* KSO2 is inverted */
-GPIO(KBD_KSO2,             PIN(1, 7), GPIO_OUT_LOW)
-
 GPIO(USB_C0_5V_EN,       PIN(D, 3), GPIO_OUT_LOW | GPIO_PULL_UP)
 
 GPIO(ENTERING_RW,          PIN(7, 6), GPIO_OUT_LOW)
@@ -150,15 +147,5 @@ ALTERNATE(PIN_MASK(8, 0x01), 1,  MODULE_PWM,           0)
 ALTERNATE(PIN_MASK(6, 0x30), 1,  MODULE_UART,          GPIO_PULL_UP)
 /* ADC0-4 */
 ALTERNATE(PIN_MASK(4, 0x3e), 1,  MODULE_ADC,           0)
-
-/* Keyboard Columns */
-ALTERNATE(PIN_MASK(0, 0xE0), 0,  MODULE_KEYBOARD_SCAN, 0)
-ALTERNATE(PIN_MASK(1, 0x7F), 0,  MODULE_KEYBOARD_SCAN, 0)
-ALTERNATE(PIN_MASK(2, 0x03), 0,  MODULE_KEYBOARD_SCAN, 0)
-
-/* Keyboard Rows */
-ALTERNATE(PIN_MASK(2, 0xFC), 0,  MODULE_KEYBOARD_SCAN, 0)
-ALTERNATE(PIN_MASK(3, 0x03), 0,  MODULE_KEYBOARD_SCAN, 0)
-
 /* External 32KHz input clock - GPIOE7 */
 ALTERNATE(PIN_MASK(E, 0x80), 1,  MODULE_CLOCK,         0)