diff options
| author | Abe Levkoy <alevkoy@chromium.org> | 2019-10-04 14:22:25 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-10-05 03:12:18 +0000 |
| commit | faacff7deeed02905e31174463c613633062e762 (patch) | |
| tree | 593f948ec0333a652782c3b9ab39443a4fbfcdab /board/volteer | |
| parent | 376d2f802aeae034d523d79317fc48d25c35e25a (diff) | |
| download | chrome-ec-faacff7deeed02905e31174463c613633062e762.tar.gz | |
volteer: Configure GPIOs connected to keyboard
Configure the pins connected to the keyboard scan lines.
BUG=b:139554320
TEST=make buildall
BRANCH=none
Change-Id: I245122aa589424b1cb397f99b5fd60deb434d87a
Signed-off-by: Abe Levkoy <alevkoy@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1841884
Reviewed-by: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'board/volteer')
| -rw-r--r-- | board/volteer/board.h | 1 | ||||
| -rw-r--r-- | board/volteer/gpio.inc | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/board/volteer/board.h b/board/volteer/board.h index 81b5d63c58..bdfa908d8b 100644 --- a/board/volteer/board.h +++ b/board/volteer/board.h @@ -46,6 +46,7 @@ #define GPIO_EC_INT_L EC_PCH_INT_ODL #define GPIO_ENTERING_RW GPIO_EC_ENTERING_RW #define GPIO_LID_OPEN GPIO_EC_LID_OPEN +#define GPIO_KBD_KSO2 GPIO_EC_KSO_02_INV #define GPIO_PCH_WAKE_L GPIO_EC_PCH_WAKE_ODL #define GPIO_PCH_PWRBTN_L GPIO_EC_PCH_PWR_BTN_ODL #define GPIO_PCH_RTCRST GPIO_EC_PCH_RTCRST diff --git a/board/volteer/gpio.inc b/board/volteer/gpio.inc index e340f2945b..af447ce426 100644 --- a/board/volteer/gpio.inc +++ b/board/volteer/gpio.inc @@ -76,6 +76,16 @@ ALTERNATE(PIN_MASK(B, BIT(3) | BIT(2)), 0, MODULE_I2C, 0) ALTERNATE(PIN_MASK(C, BIT(2) | BIT(3) | BIT(4)), 0, MODULE_PWM, 0) /* LED{3,2,1}_L */ +/* Keyboard pins */ +#define GPIO_KB_INPUT (GPIO_INPUT | GPIO_PULL_UP) +ALTERNATE(PIN_MASK(3, 0x03), 0, MODULE_KEYBOARD_SCAN, GPIO_KB_INPUT) /* KSI_00-01 */ +ALTERNATE(PIN_MASK(2, 0xFC), 0, MODULE_KEYBOARD_SCAN, GPIO_KB_INPUT) /* KSI_02-07 */ +ALTERNATE(PIN_MASK(2, 0x03), 0, MODULE_KEYBOARD_SCAN, GPIO_ODR_HIGH) /* KSO_00-01 */ +GPIO(EC_KSO_02_INV, PIN(1, 7), GPIO_OUT_LOW) /* KSO_02 */ +ALTERNATE(PIN_MASK(1, 0x7F), 0, MODULE_KEYBOARD_SCAN, GPIO_ODR_HIGH) /* KSO_03-09 */ +ALTERNATE(PIN_MASK(0, 0xF0), 0, MODULE_KEYBOARD_SCAN, GPIO_ODR_HIGH) /* KSO_10-13 */ +ALTERNATE(PIN_MASK(8, 0x04), 0, MODULE_KEYBOARD_SCAN, GPIO_ODR_HIGH) /* KSO_14 */ + /* UART */ ALTERNATE(PIN_MASK(6, BIT(5) | BIT(4)), 0, MODULE_UART, 0) /* UART from EC to Servo */ |