diff options
author | David Schneider <dnschneid@chromium.org> | 2016-04-30 00:11:57 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2016-04-30 13:26:20 -0700 |
commit | c5d5ae7f1cc66e0f451f968bf6db6ebe73a2e980 (patch) | |
tree | 89e1a12d1fafcecc3d4b46b079590f4136e9e0ca | |
parent | b2280c24b4bb93aaa4b41592ea8fa34aeed7d789 (diff) | |
download | chrome-ec-c5d5ae7f1cc66e0f451f968bf6db6ebe73a2e980.tar.gz |
Invert KSO2 on Kevin
TEST=confirm column 2 keys work
BUG=none
BRANCH=none
Change-Id: Ib474a46ac723657b96970735dc4e3a1d0c8a8505
Signed-off-by: David Schneider <dnschneid@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/341581
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Shawn N <shawnn@chromium.org>
-rw-r--r-- | board/kevin/board.h | 1 | ||||
-rw-r--r-- | board/kevin/gpio.inc | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/board/kevin/board.h b/board/kevin/board.h index c2356576e8..08408d24b9 100644 --- a/board/kevin/board.h +++ b/board/kevin/board.h @@ -25,6 +25,7 @@ #define CONFIG_I2C #define CONFIG_I2C_MASTER #define CONFIG_KEYBOARD_BOARD_CONFIG +#define CONFIG_KEYBOARD_COL2_INVERTED #define CONFIG_KEYBOARD_PROTOCOL_MKBP /* Instead of 8042 protocol of keyboard */ #define CONFIG_POWER_BUTTON /* TODO: Verify W25Q40 protect regs are compatible with W25X40 */ diff --git a/board/kevin/gpio.inc b/board/kevin/gpio.inc index 48292085e6..b280bfb679 100644 --- a/board/kevin/gpio.inc +++ b/board/kevin/gpio.inc @@ -85,6 +85,8 @@ GPIO(CLK_32K_IN, PIN(E, 7), GPIO_INPUT) /* TODO - check if internal PU is needed */ GPIO(LID_ACCEL_INT_L, PIN(C, 7), GPIO_INPUT | GPIO_PULL_UP) +/* KSO2 is inverted */ +GPIO(KBD_KSO2, PIN(1, 7), GPIO_OUT_LOW) GPIO(C0_VOUT_EN_L, PIN(D, 3), GPIO_OUT_HIGH | GPIO_OPEN_DRAIN) GPIO(C1_VOUT_EN_L, PIN(D, 2), GPIO_OUT_HIGH | GPIO_OPEN_DRAIN) @@ -138,7 +140,7 @@ 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, 0xFF), 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 */ |