diff options
| author | Nicolas Boichat <drinkcat@google.com> | 2017-01-20 11:04:08 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-02-07 20:14:20 -0800 |
| commit | 047f41b9782da861c440eb62d3a504be83a7cc41 (patch) | |
| tree | e2d6ada3e63b5864a8f9b5cc671a6f1a59c3f8b7 | |
| parent | 4c97751ca37ad46625b311cacd99057a5433551d (diff) | |
| download | chrome-ec-047f41b9782da861c440eb62d3a504be83a7cc41.tar.gz | |
hammer: Update pin layout
Previous layout was temporary, on an evaluation board.
BRANCH=none
BUG=chrome-os-partner:59083
TEST=make BOARD=hammer
Change-Id: I14478b9613e4e481bbdc71e595d218d585fbd8e5
Reviewed-on: https://chromium-review.googlesource.com/430574
Commit-Ready: Nicolas Boichat <drinkcat@chromium.org>
Tested-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
| -rw-r--r-- | board/hammer/gpio.inc | 61 |
1 files changed, 34 insertions, 27 deletions
diff --git a/board/hammer/gpio.inc b/board/hammer/gpio.inc index 3f11a9c2a5..bc8c31e686 100644 --- a/board/hammer/gpio.inc +++ b/board/hammer/gpio.inc @@ -8,44 +8,51 @@ /* Declare symbolic names for all the GPIOs that we care about. * Note: Those with interrupt handlers must be declared first. */ -GPIO_INT(TOUCHPAD_INT, PIN(A, 1), GPIO_INT_FALLING | GPIO_PULL_UP, elan_tp_interrupt) +GPIO_INT(TOUCHPAD_INT, PIN(B, 8), GPIO_INT_FALLING, elan_tp_interrupt) /* Keyboard inputs */ #define GPIO_KB_INPUT (GPIO_INPUT | GPIO_PULL_UP | GPIO_INT_BOTH) #define GPIO_KB_OUTPUT GPIO_ODR_HIGH -GPIO_INT(KB_IN00, PIN(A, 3), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) -GPIO_INT(KB_IN01, PIN(A, 2), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) -GPIO_INT(KB_IN02, PIN(A, 11), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) -GPIO_INT(KB_IN03, PIN(A, 4), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) -GPIO_INT(KB_IN04, PIN(A, 5), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) -GPIO_INT(KB_IN05, PIN(A, 6), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) -GPIO_INT(KB_IN06, PIN(A, 7), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) -GPIO_INT(KB_IN07, PIN(A, 8), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) - -GPIO(KB_OUT00, PIN(B, 0), GPIO_KB_OUTPUT) -GPIO(KB_OUT01, PIN(B, 10), GPIO_KB_OUTPUT) -GPIO(KB_OUT02, PIN(B, 12), GPIO_KB_OUTPUT) -GPIO(KB_OUT03, PIN(B, 2), GPIO_KB_OUTPUT) -GPIO(KB_OUT04, PIN(B, 11), GPIO_KB_OUTPUT) -GPIO(KB_OUT05, PIN(D, 14), GPIO_KB_OUTPUT) -GPIO(KB_OUT06, PIN(D, 13), GPIO_KB_OUTPUT) -GPIO(KB_OUT07, PIN(D, 15), GPIO_KB_OUTPUT) -GPIO(KB_OUT08, PIN(C, 2), GPIO_KB_OUTPUT) -GPIO(KB_OUT09, PIN(B, 1), GPIO_KB_OUTPUT) -GPIO(KB_OUT10, PIN(C, 5), GPIO_KB_OUTPUT) -GPIO(KB_OUT11, PIN(C, 4), GPIO_KB_OUTPUT) -GPIO(KB_OUT12, PIN(D, 5), GPIO_KB_OUTPUT) +GPIO_INT(KB_IN00, PIN(A, 4), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) +GPIO_INT(KB_IN01, PIN(B, 3), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) +GPIO_INT(KB_IN02, PIN(B, 0), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) +GPIO_INT(KB_IN03, PIN(A, 7), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) +GPIO_INT(KB_IN04, PIN(B, 12), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt) +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) + +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) +GPIO(KB_OUT03, PIN(A, 2), GPIO_KB_OUTPUT) +GPIO(KB_OUT04, PIN(A, 6), GPIO_KB_OUTPUT) +GPIO(KB_OUT05, PIN(A, 0), GPIO_KB_OUTPUT) +GPIO(KB_OUT06, PIN(A, 1), GPIO_KB_OUTPUT) +GPIO(KB_OUT07, PIN(B, 13), GPIO_KB_OUTPUT) +GPIO(KB_OUT08, PIN(C, 14), GPIO_KB_OUTPUT) +GPIO(KB_OUT09, PIN(C, 15), GPIO_KB_OUTPUT) +GPIO(KB_OUT10, PIN(F, 1), GPIO_KB_OUTPUT) +GPIO(KB_OUT11, PIN(F, 0), GPIO_KB_OUTPUT) +GPIO(KB_OUT12, PIN(C, 13), GPIO_KB_OUTPUT) /* I2C pins should be configured as inputs until I2C module is */ /* initialized. This will avoid driving the lines unintentionally.*/ -GPIO(MASTER_I2C_SCL, PIN(B, 8), GPIO_INPUT) -GPIO(MASTER_I2C_SDA, PIN(B, 9), GPIO_INPUT) +GPIO(MASTER_I2C_SCL, PIN(B, 6), GPIO_INPUT) +GPIO(MASTER_I2C_SDA, PIN(B, 7), GPIO_INPUT) +/* TODO(crosbug.com/p/59083): Disable trackpad when appropriate */ +GPIO(EN_PP3300_TP_ODL, PIN(A, 14), GPIO_OUT_LOW) + +GPIO(KEYBOARD_BACKLIGHT, PIN(B, 9), GPIO_OUT_LOW) + +GPIO(WP_L, PIN(A, 13), GPIO_INPUT) /* Unimplemented signals since we are not an EC */ UNIMPLEMENTED(ENTERING_RW) -UNIMPLEMENTED(WP_L) ALTERNATE(PIN_MASK(A, 0x0600), 1, MODULE_UART, 0) /* USART1: PA09/PA10 - Servo stm32 console UART */ -ALTERNATE(PIN_MASK(B, 0x0300), 1, MODULE_I2C, 0) /* I2C MASTER:PB8/9 GPIO_ODR_HIGH */ +ALTERNATE(PIN_MASK(B, 0x00c0), 1, MODULE_I2C, 0) /* I2C MASTER:PB6/7 GPIO_ODR_HIGH */ + +ALTERNATE(PIN_MASK(B, 0x0200), 2, MODULE_PWM, GPIO_DEFAULT) /* PWM: PB9 */ |