diff options
| author | Edward Hill <ecgh@chromium.org> | 2019-08-15 15:06:36 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-08-20 15:52:57 +0000 |
| commit | a1aea89ae15c85d56f52976289a329e7c58bc8f6 (patch) | |
| tree | 669246d3c127ef75853226d8cd999c56b02e9d3d /baseboard | |
| parent | ef13ee4c09af46eec9fb83903210c9638be50f20 (diff) | |
| download | chrome-ec-a1aea89ae15c85d56f52976289a329e7c58bc8f6.tar.gz | |
Trembyle: Make GPIO names match schematic
BUG=none
BRANCH=none
TEST=make BOARD=trembyle
Change-Id: I870bb384e59468c91ad19ebfbdf6d376438ae7ba
Signed-off-by: Edward Hill <ecgh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1755648
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Denis Brockus <dbrockus@chromium.org>
Diffstat (limited to 'baseboard')
| -rw-r--r-- | baseboard/zork/baseboard.c | 32 | ||||
| -rw-r--r-- | baseboard/zork/baseboard.h | 1 | ||||
| -rw-r--r-- | baseboard/zork/usb_pd_policy.c | 2 |
3 files changed, 17 insertions, 18 deletions
diff --git a/baseboard/zork/baseboard.c b/baseboard/zork/baseboard.c index c18a38fc39..e160c7b38d 100644 --- a/baseboard/zork/baseboard.c +++ b/baseboard/zork/baseboard.c @@ -111,57 +111,57 @@ const struct i2c_port_t i2c_ports[] = { .name = "tcpc0", .port = I2C_PORT_TCPC0, .kbps = 400, - .scl = GPIO_I2C0_SCL, - .sda = GPIO_I2C0_SDA, + .scl = GPIO_EC_I2C_USB_A0_C0_SCL, + .sda = GPIO_EC_I2C_USB_A0_C0_SDA, }, { .name = "tcpc1", .port = I2C_PORT_TCPC1, .kbps = 400, - .scl = GPIO_I2C1_SCL, - .sda = GPIO_I2C1_SDA, + .scl = GPIO_EC_I2C_USB_A1_C1_SCL, + .sda = GPIO_EC_I2C_USB_A1_C1_SDA, }, { .name = "power", .port = I2C_PORT_BATTERY, .kbps = 100, - .scl = GPIO_I2C2_SCL, - .sda = GPIO_I2C2_SDA, + .scl = GPIO_EC_I2C_POWER_CBI_SCL, + .sda = GPIO_EC_I2C_POWER_CBI_SDA, }, { .name = "mux", .port = I2C_PORT_MUX, .kbps = 400, - .scl = GPIO_I2C3_SCL, - .sda = GPIO_I2C3_SDA, + .scl = GPIO_EC_I2C_USBC_AP_MUX_SCL, + .sda = GPIO_EC_I2C_USBC_AP_MUX_SDA, }, { .name = "thermal", .port = I2C_PORT_THERMAL, .kbps = 400, - .scl = GPIO_I2C4_SCL, - .sda = GPIO_I2C4_SDA, + .scl = GPIO_FCH_SIC, + .sda = GPIO_FCH_SID, }, { .name = "sensor", .port = I2C_PORT_SENSOR, .kbps = 400, - .scl = GPIO_I2C5_SCL, - .sda = GPIO_I2C5_SDA, + .scl = GPIO_EC_I2C_SENSOR_SCL, + .sda = GPIO_EC_I2C_SENSOR_SDA, }, { .name = "ap_audio", .port = I2C_PORT_AP_AUDIO, .kbps = 400, - .scl = GPIO_I2C6_SCL, - .sda = GPIO_I2C6_SDA, + .scl = GPIO_FCH_I2C_AUDIO_SCL, + .sda = GPIO_FCH_I2C_AUDIO_SDA, }, { .name = "ap_hdmi", .port = I2C_PORT_AP_HDMI, .kbps = 400, - .scl = GPIO_I2C7_SCL, - .sda = GPIO_I2C7_SDA, + .scl = GPIO_FCH_I2C_HDMI_HUB_3V3_SCL, + .sda = GPIO_FCH_I2C_HDMI_HUB_3V3_SDA, }, }; const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); diff --git a/baseboard/zork/baseboard.h b/baseboard/zork/baseboard.h index f23bf1866f..362a8d2fc0 100644 --- a/baseboard/zork/baseboard.h +++ b/baseboard/zork/baseboard.h @@ -63,7 +63,6 @@ #define CONFIG_BATTERY_CUT_OFF #define CONFIG_BATTERY_FUEL_GAUGE -#define CONFIG_BATTERY_PRESENT_GPIO GPIO_EC_BATT_PRES_L #define CONFIG_BATTERY_REVIVE_DISCONNECT #define CONFIG_BATTERY_SMART diff --git a/baseboard/zork/usb_pd_policy.c b/baseboard/zork/usb_pd_policy.c index 0a6f9413d9..f6fb5a198f 100644 --- a/baseboard/zork/usb_pd_policy.c +++ b/baseboard/zork/usb_pd_policy.c @@ -350,7 +350,7 @@ static int svdm_dp_config(int port, uint32_t *payload) */ static uint64_t hpd_deadline[CONFIG_USB_PD_PORT_COUNT]; -#define PORT_TO_HPD(port) ((port) ? GPIO_USB_C1_DP_HPD : GPIO_USB_C0_DP_HPD) +#define PORT_TO_HPD(port) ((port) ? GPIO_DP2_HPD : GPIO_USB_C0_HPD) static void svdm_dp_post_config(int port) { const struct usb_mux * const mux = &usb_muxes[port]; |