wand: Fix second UART module, remove unneeded internal pull-up

MODULE_UART should be used for console UART, and MODULE_USART for
all secondary ones (like EC-EC side channel).

BRANCH=none
BUG=b:66575472
TEST=Flash wand, EC-EC communication works

Change-Id: I241bad7902c2e7228783ae1aa9cc33ad5da2c8a2
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/958813
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
This commit is contained in:
Nicolas Boichat
2018-03-13 14:29:35 +08:00
committed by chrome-bot
parent 97e8dfa8d9
commit bb1a079a62

View File

@@ -68,7 +68,7 @@ GPIO(KEYBOARD_BACKLIGHT, PIN(B, 9), GPIO_INPUT)
GPIO(WP_L, PIN(A, 13), GPIO_INPUT | GPIO_PULL_UP)
#ifdef BOARD_WAND
GPIO(BASE_UART_TX_RX, PIN(A, 2), GPIO_ODR_HIGH | GPIO_PULL_UP)
GPIO(BASE_UART_TX_RX, PIN(A, 2), GPIO_ODR_HIGH)
GPIO(CHARGER_I2C_SCL, PIN(B, 10), GPIO_INPUT)
GPIO(CHARGER_I2C_SDA, PIN(B, 11), GPIO_INPUT)
@@ -88,7 +88,7 @@ UNIMPLEMENTED(ENTERING_RW)
ALTERNATE(PIN_MASK(A, 0x0600), 1, MODULE_UART, GPIO_PULL_UP) /* USART1: PA09/PA10 - Servo stm32 console UART */
#ifdef BOARD_WAND
ALTERNATE(PIN_MASK(A, 0x0004), 1, MODULE_UART, GPIO_ODR_HIGH) /* USART2: PA2 - EC-EC UART */
ALTERNATE(PIN_MASK(A, 0x0004), 1, MODULE_USART, 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