diff options
| author | Philip Chen <philipchen@google.com> | 2017-10-31 02:11:55 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-11-03 01:53:37 -0700 |
| commit | 7d76175df7e00f9fa0a20fcea4c12b9033573042 (patch) | |
| tree | 1fa41678e314f6dea71fa83c57ceb98c76afcb1a /board/nautilus/gpio.inc | |
| parent | 2f127f3081be00dc318b4e0b9a9947c68b24849d (diff) | |
| download | chrome-ec-7d76175df7e00f9fa0a20fcea4c12b9033573042.tar.gz | |
nautilus: Support keyboard matrix
Also fix the strapping pins for board id.
BUG=b:68684486
BRANCH=none
TEST=build Nautilus
Change-Id: I9e9b5fe73efc85456f87355524de3e7ff7a592fb
Signed-off-by: Philip Chen <philipchen@google.com>
Reviewed-on: https://chromium-review.googlesource.com/746562
Commit-Ready: Philip Chen <philipchen@chromium.org>
Tested-by: Philip Chen <philipchen@chromium.org>
Reviewed-by: Shawn N <shawnn@chromium.org>
Diffstat (limited to 'board/nautilus/gpio.inc')
| -rw-r--r-- | board/nautilus/gpio.inc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/board/nautilus/gpio.inc b/board/nautilus/gpio.inc index 11bbecd197..2d502f27c3 100644 --- a/board/nautilus/gpio.inc +++ b/board/nautilus/gpio.inc @@ -113,8 +113,7 @@ GPIO(LED_WHITE_C1, PIN(3, 0), GPIO_OUT_LOW) /* Board ID */ GPIO(BOARD_VERSION1, PIN(C, 4), GPIO_INPUT) /* Board ID bit0 */ GPIO(BOARD_VERSION2, PIN(C, 2), GPIO_INPUT) /* Board ID bit1 */ -GPIO(BOARD_VERSION3, PIN(1, 3), GPIO_INPUT) /* Board ID bit2 */ -GPIO(BOARD_VERSION4, PIN(1, 7), GPIO_INPUT) /* Board ID strap 3 (ternary) */ +GPIO(BOARD_VERSION3, PIN(5, 7), GPIO_INPUT) /* Board ID bit2 */ /* Alternate functions GPIO definitions */ ALTERNATE(PIN_MASK(6, 0x30), 1, MODULE_UART, 0) /* GPIO64-65 */ /* UART from EC to Servo */ @@ -124,3 +123,11 @@ ALTERNATE(PIN_MASK(9, 0x06), 1, MODULE_I2C, 0) /* GPIO91-92 */ /* EC_I2C2_PMIC ALTERNATE(PIN_MASK(B, 0x30), 1, MODULE_I2C, 0) /* GPIOB4-B5 */ /* EC_I2C0_0_USBC_3V3_SDA/SCL */ ALTERNATE(PIN_MASK(B, 0x0C), 1, MODULE_I2C, 0) /* GPOPB2-B3 */ /* EC_I2C0_1_3V3_SDA/SCL */ ALTERNATE(PIN_MASK(D, 0x03), 1, MODULE_I2C, 0) /* GPIOD0-D1 */ /* EC_I2C3_SENSOR_1V8_SDA/SCL */ + +/* Keyboard pins */ +ALTERNATE(PIN_MASK(3, 0x03), 0, MODULE_KEYBOARD_SCAN, 0) +ALTERNATE(PIN_MASK(2, 0xfc), 0, MODULE_KEYBOARD_SCAN, 0) +ALTERNATE(PIN_MASK(2, 0x03), 0, MODULE_KEYBOARD_SCAN, 0) +ALTERNATE(PIN_MASK(0, 0xe0), 0, MODULE_KEYBOARD_SCAN, 0) +ALTERNATE(PIN_MASK(1, 0x7f), 0, MODULE_KEYBOARD_SCAN, 0) +GPIO(KBD_KSO2, PIN(1, 7), GPIO_OUT_LOW) |