From 7ef9d3c349fe16336c5656b2fbcc301baa08f6df Mon Sep 17 00:00:00 2001 From: Ryan Zhang Date: Mon, 7 Dec 2015 16:10:14 +0800 Subject: [PATCH] Lars: Add Keyboard COL2 Invert The silego in Lars is supposed to be inverted. This CL can not be compiled because of 'MODULE_PWM_KBLIGHT'. I didn't modify this to prevent a merge conflict from https://chromium-review.googlesource.com/#/c/316351/ in ToT. BUG=chrome-os-partner:48205 BRANCH=lars TEST=None Change-Id: Iee6fa996440287fd1f1af456f9842d810597bd23 Signed-off-by: Ryan Zhang Reviewed-on: https://chromium-review.googlesource.com/316360 Reviewed-by: Shawn N --- board/lars/board.h | 1 + board/lars/gpio.inc | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/board/lars/board.h b/board/lars/board.h index 7ac2d5f3fd..832c022c5d 100644 --- a/board/lars/board.h +++ b/board/lars/board.h @@ -51,6 +51,7 @@ #define CONFIG_HOSTCMD_PD #define CONFIG_I2C #define CONFIG_I2C_MASTER +#define CONFIG_KEYBOARD_COL2_INVERTED #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_LED_COMMON #define CONFIG_LID_SWITCH diff --git a/board/lars/gpio.inc b/board/lars/gpio.inc index cdc8275a2b..837b941632 100644 --- a/board/lars/gpio.inc +++ b/board/lars/gpio.inc @@ -97,6 +97,7 @@ GPIO(NC_204, PIN(204), GPIO_INPUT | GPIO_PULL_UP) GPIO(PVT_CS0, PIN(146), GPIO_ODR_HIGH) /* SPI */ GPIO(USB_C0_CHARGE_EN_L, PIN(64), GPIO_OUT_LOW) GPIO(NC_150, PIN(150), GPIO_INPUT | GPIO_PULL_UP) +GPIO(KBD_KSO2, PIN(101), GPIO_OUT_LOW) /* KB */ /* Alternate functions GPIO definitions */ @@ -115,7 +116,7 @@ ALTERNATE(PIN_MASK(12, 0x01), 1, MODULE_LPC, 0) ALTERNATE(PIN_MASK(0, 0x3f), 3, MODULE_KEYBOARD_SCAN, GPIO_KB_OUTPUT) /* KB ROW - GPIO100-GPIO104, GPIO106-GPIO107 */ /* NOTE - GP101 should be configured as GPIO */ -ALTERNATE(PIN_MASK(10, 0xdf), 3, MODULE_KEYBOARD_SCAN, GPIO_KB_OUTPUT) +ALTERNATE(PIN_MASK(10, 0xdd), 3, MODULE_KEYBOARD_SCAN, GPIO_KB_OUTPUT) /* KB COL - GPIO032 */ ALTERNATE(PIN_MASK(3, 0x04), 3, MODULE_KEYBOARD_SCAN, GPIO_KB_INPUT) /* KB COL - GPIO040, GPIO042-GPIO043 */