summaryrefslogtreecommitdiff
path: root/board/hammer/gpio.inc
diff options
context:
space:
mode:
Diffstat (limited to 'board/hammer/gpio.inc')
-rw-r--r--board/hammer/gpio.inc30
1 files changed, 25 insertions, 5 deletions
diff --git a/board/hammer/gpio.inc b/board/hammer/gpio.inc
index 3b16f643ef..1b60a32100 100644
--- a/board/hammer/gpio.inc
+++ b/board/hammer/gpio.inc
@@ -36,8 +36,13 @@ 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)
+#ifdef BOARD_WAND
+GPIO(KB_OUT02, PIN(A, 8), GPIO_KB_OUTPUT)
+GPIO(KB_OUT03, PIN(B, 4), GPIO_KB_OUTPUT)
+#else
GPIO(KB_OUT02, PIN(A, 3), GPIO_KB_OUTPUT)
GPIO(KB_OUT03, PIN(A, 2), GPIO_KB_OUTPUT)
+#endif
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)
@@ -50,8 +55,8 @@ 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, 6), GPIO_INPUT)
-GPIO(MASTER_I2C_SDA, PIN(B, 7), GPIO_INPUT)
+GPIO(TOUCHPAD_I2C_SCL, PIN(B, 6), GPIO_INPUT)
+GPIO(TOUCHPAD_I2C_SDA, PIN(B, 7), GPIO_INPUT)
/* TODO(crosbug.com/p/59083): Disable trackpad when appropriate */
#ifdef BOARD_WHISKERS
GPIO(EN_PP3300_TP, PIN(A, 14), GPIO_OUT_HIGH)
@@ -67,19 +72,34 @@ GPIO(KEYBOARD_BACKLIGHT, PIN(B, 9), GPIO_INPUT)
GPIO(WP_L, PIN(A, 13), GPIO_INPUT | GPIO_PULL_UP)
-GPIO(BASE_DET, PIN(A, 15), GPIO_INPUT)
-
#ifdef BOARD_WHISKERS
GPIO(TP_BOOT0, PIN(B, 4), GPIO_INPUT)
GPIO(TP_RESET, PIN(B, 5), GPIO_INPUT)
#endif
+#ifdef BOARD_WAND
+GPIO(BASE_UART_TX_RX, PIN(A, 2), GPIO_ODR_HIGH | GPIO_PULL_UP)
+
+GPIO(CHARGER_I2C_SCL, PIN(B, 10), GPIO_INPUT)
+GPIO(CHARGER_I2C_SDA, PIN(B, 11), GPIO_INPUT)
+
+GPIO(SWITCH_STATUS, PIN(A, 15), GPIO_INPUT)
+GPIO(EN_OTG, PIN(B, 5), GPIO_INPUT)
+#else
+GPIO(BASE_DET, PIN(A, 15), GPIO_INPUT)
+#endif
+
/* Unimplemented signals since we are not an EC */
UNIMPLEMENTED(ENTERING_RW)
ALTERNATE(PIN_MASK(A, 0x0600), 1, MODULE_UART, GPIO_PULL_UP) /* USART1: PA09/PA10 - Servo stm32 console UART */
-ALTERNATE(PIN_MASK(B, 0x00c0), 1, MODULE_I2C, 0) /* I2C MASTER:PB6/7 GPIO_ODR_HIGH */
+#ifdef BOARD_WAND
+ALTERNATE(PIN_MASK(A, 0x0004), 1, MODULE_UART, GPIO_ODR_HIGH) /* USART2: PA2 - EC-EC UART */
+ALTERNATE(PIN_MASK(B, 0x0c00), 1, MODULE_I2C, 0) /* I2C CHARGER: PB10/11 GPIO_ODR_HIGH */
+#endif
+
+ALTERNATE(PIN_MASK(B, 0x00c0), 1, MODULE_I2C, 0) /* I2C TOUCHPAD: PB6/7 GPIO_ODR_HIGH */
#ifdef BOARD_WHISKERS
ALTERNATE(PIN_MASK(B, 0x0100), 2, MODULE_PWM, GPIO_PULL_DOWN) /* PWM: PB8 */