From 3b00f5fed875d11167aeb1f382825f571e616216 Mon Sep 17 00:00:00 2001 From: Alec Berg Date: Mon, 29 Sep 2014 18:47:37 -0700 Subject: [PATCH] samus: add auto unwedge to all i2c busses Allow automatic wedge detection and unwedge to all i2c busses on Samus. BUG=chrome-os-partner:32471 BRANCH=samus TEST=make -j buildall Change-Id: I4a9f91532c479da527bdf40531732108aa2c2c89 Signed-off-by: Alec Berg Reviewed-on: https://chromium-review.googlesource.com/220467 Reviewed-by: Duncan Laurie Commit-Queue: Duncan Laurie --- board/samus/board.c | 4 ++-- board/samus/gpio.inc | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/board/samus/board.c b/board/samus/board.c index d6b77430d6..4e4e24f4b2 100644 --- a/board/samus/board.c +++ b/board/samus/board.c @@ -124,8 +124,8 @@ BUILD_ASSERT(ARRAY_SIZE(fans) == CONFIG_FANS); /* I2C ports */ const struct i2c_port_t i2c_ports[] = { {"batt_chg", 0, 100, GPIO_I2C0_SCL, GPIO_I2C0_SDA}, - {"lightbar", 1, 400}, - {"thermal", 5, 100}, + {"lightbar", 1, 400, GPIO_I2C1_SCL, GPIO_I2C1_SDA}, + {"thermal", 5, 100, GPIO_I2C5_SCL, GPIO_I2C5_SDA}, }; const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); diff --git a/board/samus/gpio.inc b/board/samus/gpio.inc index c52e2cfcd4..d4abcc0edd 100644 --- a/board/samus/gpio.inc +++ b/board/samus/gpio.inc @@ -94,6 +94,10 @@ GPIO(USB2_ILIM_SEL_L, D, 6, GPIO_OUT_HIGH, NULL) /* USB charger port 2 ILIM_ GPIO(I2C0_SCL, B, 2, GPIO_ODR_HIGH, NULL) /* I2C port 0 SCL */ GPIO(I2C0_SDA, B, 3, GPIO_ODR_HIGH, NULL) /* I2C port 0 SDA */ +GPIO(I2C1_SCL, A, 6, GPIO_ODR_HIGH, NULL) /* I2C port 1 SCL */ +GPIO(I2C1_SDA, A, 7, GPIO_ODR_HIGH, NULL) /* I2C port 1 SDA */ +GPIO(I2C5_SCL, B, 6, GPIO_ODR_HIGH, NULL) /* I2C port 5 SCL */ +GPIO(I2C5_SDA, B, 7, GPIO_ODR_HIGH, NULL) /* I2C port 5 SDA */ ALTERNATE(A, 0x03, 1, MODULE_UART, 0) /* UART0 */ ALTERNATE(A, 0x40, 3, MODULE_I2C, 0) /* I2C1 SCL */