diff options
| author | Zhuohao Lee <zhuohao@chromium.org> | 2018-09-01 16:09:21 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-09-02 02:13:48 -0700 |
| commit | 6fed8a71463c9dfda78872c167ae52d8a330e458 (patch) | |
| tree | daa640c84181076353be49359e03adbfa62cd4e3 /board/rammus/board.c | |
| parent | f0b38bc1c456eac7b2d7e82c2758a78de1017395 (diff) | |
| download | chrome-ec-6fed8a71463c9dfda78872c167ae52d8a330e458.tar.gz | |
rammus: Fix the dut keeps reboot due to the EC assert.
The dut keeps reboot due to the EC Assert. The problem is caused by
the changing of I2C_PORT_TCPC1 to NPCX_I2C_PORT0_0 (cl:1189663) and
the NPCX_I2C_PORT0_1 is removed from the i2c_ports[]. As a result,
when someone uses NPCX_I2C_PORT0_1, the assert popped out.
This patch changes the 'name' and 'port' of i2c_ports[] to avoid this
problem.
BUG=b:113715116
BRANCH=master
TEST=dut boot successfully
Change-Id: I90f7a1dcdec3ff2719f34786e9e57411b703562b
Signed-off-by: Zhuohao Lee <zhuohao@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1200662
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Diffstat (limited to 'board/rammus/board.c')
| -rw-r--r-- | board/rammus/board.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/board/rammus/board.c b/board/rammus/board.c index 716ee6c2cf..7bf268ec69 100644 --- a/board/rammus/board.c +++ b/board/rammus/board.c @@ -148,12 +148,11 @@ BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); /* I2C port map */ const struct i2c_port_t i2c_ports[] = { - {"tcpc0", I2C_PORT_TCPC0, 400, GPIO_I2C0_0_SCL, GPIO_I2C0_0_SDA}, - {"tcpc1", I2C_PORT_TCPC1, 400, GPIO_I2C0_1_SCL, GPIO_I2C0_1_SDA}, - {"battery", I2C_PORT_BATTERY, 100, GPIO_I2C1_SCL, GPIO_I2C1_SDA}, - {"charger", I2C_PORT_CHARGER, 100, GPIO_I2C1_SCL, GPIO_I2C1_SDA}, - {"pmic", I2C_PORT_PMIC, 400, GPIO_I2C2_SCL, GPIO_I2C2_SDA}, - {"accelgyro", I2C_PORT_ACCEL, 400, GPIO_I2C3_SCL, GPIO_I2C3_SDA}, + {"i2c_0_0", NPCX_I2C_PORT0_0, 400, GPIO_I2C0_0_SCL, GPIO_I2C0_0_SDA}, + {"i2c_0_1", NPCX_I2C_PORT0_1, 400, GPIO_I2C0_1_SCL, GPIO_I2C0_1_SDA}, + {"i2c_1", NPCX_I2C_PORT1, 100, GPIO_I2C1_SCL, GPIO_I2C1_SDA}, + {"i2c_2", NPCX_I2C_PORT2, 400, GPIO_I2C2_SCL, GPIO_I2C2_SDA}, + {"i2c_3", NPCX_I2C_PORT3, 400, GPIO_I2C3_SCL, GPIO_I2C3_SDA}, }; const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); |