diff options
| author | Caveh Jalali <caveh@chromium.org> | 2018-04-19 19:39:20 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-04-20 23:01:25 -0700 |
| commit | a59d855c4742e681944e2ac328bca7e3fc47d7d0 (patch) | |
| tree | 923237437645575d0e0937961663f7cfdee1b1f6 /board/atlas | |
| parent | 2952045100592b02c13d9498ac7f0351b7fa1d5f (diff) | |
| download | chrome-ec-a59d855c4742e681944e2ac328bca7e3fc47d7d0.tar.gz | |
atlas: update GPIO names to match new schematics
the latest schematics have been updated to reflect the I2C bus
numbering used in the chip datasheets. this updates the software to
be consistent with the new datasheets. this is only a renaming
exercise, there are no physical changes to the board.
BUG=b:75070158,b:78309559
BRANCH=none
TEST=it compiles
Change-Id: I16e6741c2e8a1dcc32b814a50ba12739f36fd8cf
Signed-off-by: Caveh Jalali <caveh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1020721
Commit-Ready: Caveh Jalali <caveh@google.com>
Tested-by: caveh jalali <caveh@chromium.org>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'board/atlas')
| -rw-r--r-- | board/atlas/board.c | 10 | ||||
| -rw-r--r-- | board/atlas/gpio.inc | 20 |
2 files changed, 15 insertions, 15 deletions
diff --git a/board/atlas/board.c b/board/atlas/board.c index a5d297117e..b0f4e01384 100644 --- a/board/atlas/board.c +++ b/board/atlas/board.c @@ -139,17 +139,17 @@ BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); /* I2C port map */ const struct i2c_port_t i2c_ports[] = { {"power", I2C_PORT_POWER, 100, - GPIO_EC_I2C3_POWER_SCL, GPIO_EC_I2C3_POWER_SDA}, + GPIO_EC_I2C0_POWER_SCL, GPIO_EC_I2C0_POWER_SDA}, {"tcpc0", I2C_PORT_TCPC0, 400, - GPIO_EC_I2C0_USB_C0_SCL, GPIO_EC_I2C0_USB_C0_SDA}, + GPIO_EC_I2C1_USB_C0_SCL, GPIO_EC_I2C1_USB_C0_SDA}, {"tcpc1", I2C_PORT_TCPC1, 400, - GPIO_EC_I2C0_USB_C1_SCL, GPIO_EC_I2C0_USB_C1_SDA}, + GPIO_EC_I2C2_USB_C1_SCL, GPIO_EC_I2C2_USB_C1_SDA}, {"sensor", I2C_PORT_SENSOR, 100, - GPIO_EC_I2C2_SENSOR_3V3_SCL, GPIO_EC_I2C2_SENSOR_3V3_SDA}, + GPIO_EC_I2C3_SENSOR_3V3_SCL, GPIO_EC_I2C3_SENSOR_3V3_SDA}, {"battery", I2C_PORT_BATTERY, 100, GPIO_EC_I2C4_BATTERY_SCL, GPIO_EC_I2C4_BATTERY_SDA}, {"gyro", I2C_PORT_GYRO, 100, - GPIO_EC_I2C1_GYRO_SCL, GPIO_EC_I2C1_GYRO_SDA}, + GPIO_EC_I2C5_GYRO_SCL, GPIO_EC_I2C5_GYRO_SDA}, }; const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); diff --git a/board/atlas/gpio.inc b/board/atlas/gpio.inc index 76713cf432..55fde47e58 100644 --- a/board/atlas/gpio.inc +++ b/board/atlas/gpio.inc @@ -65,16 +65,16 @@ GPIO(EC_PLATFORM_RST, PIN(8, 6), GPIO_OUT_LOW) /* EC Reset to LDO_EN */ /* I2C pins - these will be reconfigured for alternate function below */ -GPIO(EC_I2C0_USB_C0_SCL, PIN(9, 0), GPIO_INPUT) /* alt fn I2C1_SCL */ -GPIO(EC_I2C0_USB_C0_SDA, PIN(8, 7), GPIO_INPUT) /* alt fn I2C1_SDA */ -GPIO(EC_I2C0_USB_C1_SCL, PIN(9, 2), GPIO_INPUT) /* alt fn I2C2_SCL */ -GPIO(EC_I2C0_USB_C1_SDA, PIN(9, 1), GPIO_INPUT) /* alt fn I2C2_SDA */ -GPIO(EC_I2C1_GYRO_SCL, PIN(3, 3), GPIO_INPUT) /* alt fn I2C5_SCL */ -GPIO(EC_I2C1_GYRO_SDA, PIN(3, 6), GPIO_INPUT) /* alt fn I2C5_SDA */ -GPIO(EC_I2C2_SENSOR_3V3_SCL, PIN(D, 1), GPIO_INPUT) /* alt fn I2C3_SCL */ -GPIO(EC_I2C2_SENSOR_3V3_SDA, PIN(D, 0), GPIO_INPUT) /* alt fn I2C3_SDA */ -GPIO(EC_I2C3_POWER_SCL, PIN(B, 5), GPIO_INPUT) /* alt fn I2C0_SCL */ -GPIO(EC_I2C3_POWER_SDA, PIN(B, 4), GPIO_INPUT) /* alt fn I2C0_SDA */ +GPIO(EC_I2C1_USB_C0_SCL, PIN(9, 0), GPIO_INPUT) /* alt fn I2C1_SCL */ +GPIO(EC_I2C1_USB_C0_SDA, PIN(8, 7), GPIO_INPUT) /* alt fn I2C1_SDA */ +GPIO(EC_I2C2_USB_C1_SCL, PIN(9, 2), GPIO_INPUT) /* alt fn I2C2_SCL */ +GPIO(EC_I2C2_USB_C1_SDA, PIN(9, 1), GPIO_INPUT) /* alt fn I2C2_SDA */ +GPIO(EC_I2C5_GYRO_SCL, PIN(3, 3), GPIO_INPUT) /* alt fn I2C5_SCL */ +GPIO(EC_I2C5_GYRO_SDA, PIN(3, 6), GPIO_INPUT) /* alt fn I2C5_SDA */ +GPIO(EC_I2C3_SENSOR_3V3_SCL, PIN(D, 1), GPIO_INPUT) /* alt fn I2C3_SCL */ +GPIO(EC_I2C3_SENSOR_3V3_SDA, PIN(D, 0), GPIO_INPUT) /* alt fn I2C3_SDA */ +GPIO(EC_I2C0_POWER_SCL, PIN(B, 5), GPIO_INPUT) /* alt fn I2C0_SCL */ +GPIO(EC_I2C0_POWER_SDA, PIN(B, 4), GPIO_INPUT) /* alt fn I2C0_SDA */ GPIO(EC_I2C4_BATTERY_SCL, PIN(F, 3), GPIO_INPUT) /* alt fn I2C4_SCL */ GPIO(EC_I2C4_BATTERY_SDA, PIN(F, 2), GPIO_INPUT) /* alt fn I2C4_SDA */ |