diff options
| author | Anton Staaf <robotboy@chromium.org> | 2015-03-04 11:49:50 -0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-03-10 18:52:10 +0000 |
| commit | d32be0292f1e1aa389da579ea29f7a151ae002e1 (patch) | |
| tree | 462f320b75cb7d6d9fd94e1cb30c040c83847030 | |
| parent | 9e9ccfa24bc2fe2320b675969d7275f0e642d292 (diff) | |
| download | chrome-ec-d32be0292f1e1aa389da579ea29f7a151ae002e1.tar.gz | |
Ryu: Share SensorHub UART control with Servo
Previously the EC UART connected to the SensorHub console
was being driven push/pull potentially fighting with a
connected servo. This way servo wins, but at least we
don't drive the line in opposite directions causing a
large current flow.
Signed-off-by: Anton Staaf <robotboy@chromium.org>
BRANCH=None
BUG=None
TEST=make buildall -j
Change-Id: I02b8e09af6c902b523494b757f4bc7ea4365df2e
Reviewed-on: https://chromium-review.googlesource.com/255954
Tested-by: Anton Staaf <robotboy@chromium.org>
Reviewed-by: Vic Yang <victoryang@chromium.org>
Commit-Queue: Anton Staaf <robotboy@chromium.org>
Trybot-Ready: Anton Staaf <robotboy@chromium.org>
| -rw-r--r-- | board/ryu/gpio.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/board/ryu/gpio.inc b/board/ryu/gpio.inc index 1c921db0bb..436fa89ee0 100644 --- a/board/ryu/gpio.inc +++ b/board/ryu/gpio.inc @@ -117,10 +117,12 @@ GPIO(AP_UART_RX, B, 7, GPIO_INPUT, NULL) UNIMPLEMENTED(AP_RESET_L) +#define GPIO_ODR_UP GPIO_OPEN_DRAIN | GPIO_PULL_UP + ALTERNATE(B, 0x0008, 5, MODULE_USB_PD, 0) /* SPI1: SCK(PB3) */ ALTERNATE(B, 0x0002, 2, MODULE_USB_PD, 0) /* TIM3_CH4: PB1 */ ALTERNATE(B, 0x00C0, 7, MODULE_USART, 0) /* USART1: PB6/PB7 */ ALTERNATE(D, 0x0060, 7, MODULE_UART, GPIO_PULL_UP) /* USART2: PD4/PD5 */ -ALTERNATE(C, 0x0C00, 7, MODULE_USART, 0) /* USART3: PC10/PC11 */ +ALTERNATE(C, 0x0C00, 7, MODULE_USART, GPIO_ODR_UP) /* USART3: PC10/PC11 */ ALTERNATE(A, 0xC600, 4, MODULE_I2C, 0) /* I2C SLAVE:PA9/10 MASTER:PA14/15 */ ALTERNATE(A, 0x1800,14, MODULE_USB, 0) /* USB: PA11/12 */ |