summaryrefslogtreecommitdiff
path: root/board/hammer
diff options
context:
space:
mode:
authorNicolas Boichat <drinkcat@google.com>2017-02-09 15:04:41 +0800
committerchrome-bot <chrome-bot@chromium.org>2017-02-09 03:10:23 -0800
commitb4561011587819b26395b6a16112b47a00f5a1a9 (patch)
treef8e36fa2a3c8b3ec82002e37ac54648ee29aa811 /board/hammer
parent8db50ce410cd71a6b4429fb91a3be9e103312f8f (diff)
downloadchrome-ec-b4561011587819b26395b6a16112b47a00f5a1a9.tar.gz
hammer: Add GPIO_F to KB_OUT_PORT_LIST
Without this, keyboard columns 10 and 11 do not work, as registers for port F are never set. Let's also remove port D, since we do not use it as part of the keyboard scanning. BRANCH=none BUG=chrome-os-partner:62751 TEST=flash hammer, all keys work. Change-Id: I0c07dc2420d7cd570ad8450c76f91a2bad9a50a5 Reviewed-on: https://chromium-review.googlesource.com/439908 Commit-Ready: Nicolas Boichat <drinkcat@chromium.org> Tested-by: Nicolas Boichat <drinkcat@chromium.org> Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'board/hammer')
-rw-r--r--board/hammer/board.h2
-rw-r--r--board/hammer/gpio.inc1
2 files changed, 2 insertions, 1 deletions
diff --git a/board/hammer/board.h b/board/hammer/board.h
index f627a2474c..9d45a9218b 100644
--- a/board/hammer/board.h
+++ b/board/hammer/board.h
@@ -63,7 +63,7 @@
/* Keyboard output port list */
#define CONFIG_KEYBOARD_DEBUG
-#define KB_OUT_PORT_LIST GPIO_A, GPIO_B, GPIO_C, GPIO_D
+#define KB_OUT_PORT_LIST GPIO_A, GPIO_B, GPIO_C, GPIO_F
/* Enable I2C */
#define CONFIG_I2C
diff --git a/board/hammer/gpio.inc b/board/hammer/gpio.inc
index bc8c31e686..bc8dbdfd0b 100644
--- a/board/hammer/gpio.inc
+++ b/board/hammer/gpio.inc
@@ -23,6 +23,7 @@ GPIO_INT(KB_IN05, PIN(B, 2), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
GPIO_INT(KB_IN06, PIN(B, 14), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
GPIO_INT(KB_IN07, PIN(B, 15), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
+/* Do not forget to update KB_OUT_PORT_LIST to match this. */
GPIO(KB_OUT00, PIN(B, 1), GPIO_KB_OUTPUT)
GPIO(KB_OUT01, PIN(A, 5), GPIO_KB_OUTPUT)
GPIO(KB_OUT02, PIN(A, 3), GPIO_KB_OUTPUT)