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 | |
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>
-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 | ||||
-rw-r--r-- | board/trembyle/board.h | 22 | ||||
-rw-r--r-- | board/trembyle/gpio.inc | 80 |
5 files changed, 79 insertions, 58 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]; diff --git a/board/trembyle/board.h b/board/trembyle/board.h index d3f80cb8ef..71ffdb4783 100644 --- a/board/trembyle/board.h +++ b/board/trembyle/board.h @@ -32,6 +32,28 @@ #define CONFIG_LID_ANGLE_SENSOR_BASE BASE_ACCEL #define CONFIG_LID_ANGLE_SENSOR_LID LID_ACCEL +/* GPIO mapping from board specific name to EC common name. */ +#define CONFIG_BATTERY_PRESENT_GPIO GPIO_EC_BATT_PRES_ODL +#define GPIO_AC_PRESENT GPIO_ACOK_OD +#define GPIO_CPU_PROCHOT GPIO_PROCHOT_ODL +#define GPIO_EC_INT_L GPIO_EC_AP_INT_ODL +#define GPIO_ENABLE_BACKLIGHT_L GPIO_EC_EDP_BL_DISABLE +#define GPIO_ENTERING_RW GPIO_EC_ENTERING_RW +#define GPIO_KBD_KSO2 GPIO_EC_KSO_02_INV +#define GPIO_PCH_PWRBTN_L GPIO_EC_FCH_PWR_BTN_L +#define GPIO_PCH_RSMRST_L GPIO_EC_FCH_RSMRST_L +#define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L +#define GPIO_PCH_SLP_S5_L GPIO_SLP_S5_L +#define GPIO_PCH_SYS_PWROK GPIO_EC_FCH_PWROK +#define GPIO_PCH_WAKE_L GPIO_EC_FCH_WAKE_L +#define GPIO_POWER_BUTTON_L GPIO_EC_PWR_BTN_ODL +#define GPIO_S0_PGOOD GPIO_S0_PWROK_OD +#define GPIO_S5_PGOOD GPIO_EC_PWROK_OD +#define GPIO_SYS_RESET_L GPIO_EC_SYS_RST_L +#define GPIO_VOLUME_DOWN_L GPIO_VOLDN_BTN_ODL +#define GPIO_VOLUME_UP_L GPIO_VOLUP_BTN_ODL +#define GPIO_WP_L GPIO_EC_WP_L + #ifndef __ASSEMBLER__ enum battery_type { diff --git a/board/trembyle/gpio.inc b/board/trembyle/gpio.inc index 0a4f8cf304..cb5889aae0 100644 --- a/board/trembyle/gpio.inc +++ b/board/trembyle/gpio.inc @@ -14,16 +14,16 @@ GPIO_INT(USB_C0_PPC_INT_ODL, PIN(6, 3), GPIO_INT_FALLING, ppc_interrupt) GPIO_INT(USB_C1_PPC_INT_ODL, PIN(D, 4), GPIO_INT_FALLING, ppc_interrupt) GPIO_INT(USB_C0_BC12_INT_ODL, PIN(9, 3), GPIO_INT_FALLING | GPIO_PULL_UP, bc12_interrupt) GPIO_INT(USB_C1_BC12_INT_ODL, PIN(A, 4), GPIO_INT_FALLING | GPIO_PULL_UP, bc12_interrupt) -GPIO_INT(PCH_SLP_S3_L, PIN(7, 4), GPIO_INT_BOTH, power_signal_interrupt) -GPIO_INT(PCH_SLP_S5_L, PIN(E, 0), GPIO_INT_BOTH, power_signal_interrupt) -GPIO_INT(S0_PGOOD, PIN(5, 6), GPIO_INT_BOTH, power_signal_interrupt) -GPIO_INT(S5_PGOOD, PIN(3, 7), GPIO_INT_BOTH, power_signal_interrupt) -GPIO_INT(POWER_BUTTON_L, PIN(0, 1), GPIO_INT_BOTH, power_button_interrupt) +GPIO_INT(SLP_S3_L, PIN(7, 4), GPIO_INT_BOTH, power_signal_interrupt) +GPIO_INT(SLP_S5_L, PIN(E, 0), GPIO_INT_BOTH, power_signal_interrupt) +GPIO_INT(S0_PWROK_OD, PIN(5, 6), GPIO_INT_BOTH, power_signal_interrupt) +GPIO_INT(EC_PWROK_OD, PIN(3, 7), GPIO_INT_BOTH, power_signal_interrupt) +GPIO_INT(EC_PWR_BTN_ODL, PIN(0, 1), GPIO_INT_BOTH, power_button_interrupt) GPIO_INT(LID_OPEN, PIN(D, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, lid_interrupt) -GPIO_INT(AC_PRESENT, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, extpower_interrupt) -GPIO_INT(WP_L, PIN(5, 0), GPIO_INT_BOTH, switch_interrupt) -GPIO_INT(VOLUME_DOWN_L, PIN(A, 6), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) -GPIO_INT(VOLUME_UP_L, PIN(9, 5), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) +GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, extpower_interrupt) +GPIO_INT(EC_WP_L, PIN(5, 0), GPIO_INT_BOTH, switch_interrupt) +GPIO_INT(VOLDN_BTN_ODL, PIN(A, 6), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) +GPIO_INT(VOLUP_BTN_ODL, PIN(9, 5), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) GPIO_INT(6AXIS_INT_L, PIN(A, 0), GPIO_INT_FALLING | GPIO_PULL_UP, bmi160_interrupt) /* GPIO_INT_BOTH is required for PSL wake from hibernate, but we don't need an interrupt handler. */ @@ -31,21 +31,21 @@ GPIO(EC_RST_ODL, PIN(0, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH) GPIO(3AXIS_INT_L, PIN(9, 6), GPIO_INPUT | GPIO_PULL_UP) /* 3 Axis Accel */ GPIO(CCD_MODE_ODL, PIN(C, 6), GPIO_INPUT) /* Case Closed Debug Mode */ -GPIO(CPU_PROCHOT, PIN(D, 5), GPIO_ODR_HIGH) /* PROCHOT to SOC */ -GPIO(EC_BATT_PRES_L, PIN(4, 1), GPIO_INPUT) /* Battery Present */ -GPIO(EC_INT_L, PIN(A, 3), GPIO_ODR_HIGH) /* Sensor MKBP event to SOC */ +GPIO(PROCHOT_ODL, PIN(D, 5), GPIO_ODR_HIGH) /* PROCHOT to SOC */ +GPIO(EC_BATT_PRES_ODL, PIN(4, 1), GPIO_INPUT) /* Battery Present */ +GPIO(EC_AP_INT_ODL, PIN(A, 3), GPIO_ODR_HIGH) /* Sensor MKBP event to SOC */ GPIO(EN_PWR_A, PIN(B, 7), GPIO_OUT_LOW) /* Enable Power */ -GPIO(ENABLE_BACKLIGHT_L, PIN(A, 2), GPIO_OUT_HIGH) /* Enable Backlight */ -GPIO(ENTERING_RW, PIN(E, 5), GPIO_OUT_LOW) /* EC Entering RW */ -GPIO(PCH_PWRBTN_L, PIN(8, 6), GPIO_OUT_HIGH) /* Power Button to SOC */ -GPIO(PCH_RSMRST_L, PIN(A, 1), GPIO_OUT_LOW) /* RSMRST# to SOC */ -GPIO(PCH_SYS_PWROK, PIN(7, 5), GPIO_OUT_LOW) /* Power OK to SOC */ -GPIO(PCH_WAKE_L, PIN(0, 3), GPIO_OUT_HIGH) /* Wake SOC */ -GPIO(SYS_RESET_L, PIN(C, 7), GPIO_ODR_HIGH) /* Cold Reset to SOC */ +GPIO(EC_EDP_BL_DISABLE, PIN(A, 2), GPIO_OUT_HIGH) /* Enable Backlight */ +GPIO(EC_ENTERING_RW, PIN(E, 5), GPIO_OUT_LOW) /* EC Entering RW */ +GPIO(EC_FCH_PWR_BTN_L, PIN(8, 6), GPIO_OUT_HIGH) /* Power Button to SOC */ +GPIO(EC_FCH_RSMRST_L, PIN(A, 1), GPIO_OUT_LOW) /* RSMRST# to SOC */ +GPIO(EC_FCH_PWROK, PIN(7, 5), GPIO_OUT_LOW) /* Power OK to SOC */ +GPIO(EC_FCH_WAKE_L, PIN(0, 3), GPIO_OUT_HIGH) /* Wake SOC */ +GPIO(EC_SYS_RST_L, PIN(C, 7), GPIO_ODR_HIGH) /* Cold Reset to SOC */ GPIO(USB_C0_TCPC_RST_L, PIN(E, 1), GPIO_OUT_HIGH) /* C0 TCPC Reset */ GPIO(USB_C1_TCPC_RST_L, PIN(F, 0), GPIO_OUT_HIGH) /* C1 TCPC Reset */ -GPIO(USB_C0_DP_HPD, PIN(F, 5), GPIO_OUT_LOW) /* C0 DP Hotplug Detect */ -GPIO(USB_C1_DP_HPD, PIN(C, 1), GPIO_OUT_LOW) /* C1 DP Hotplug Detect */ +GPIO(USB_C0_HPD, PIN(F, 5), GPIO_OUT_LOW) /* C0 DP Hotplug Detect */ +GPIO(DP2_HPD, PIN(C, 1), GPIO_OUT_LOW) /* C1 DP Hotplug Detect */ GPIO(LED_FULL_L, PIN(6, 0), GPIO_OUT_HIGH) GPIO(LED_CHRG_L, PIN(C, 0), GPIO_OUT_HIGH) @@ -56,8 +56,8 @@ IOEX(KB_BL_EN, EXPIN(USBC_PORT_C0, 1, 3), GPIO_OUT_LOW) /* KB Backlight Enable IOEX(EN_USB_A0_5V, EXPIN(USBC_PORT_C0, 1, 5), GPIO_OUT_LOW) /* A0 5V Source Enable */ IOEX(USB_A0_CHARGE_EN_L, EXPIN(USBC_PORT_C0, 1, 6), GPIO_OUT_HIGH) /* A0 5V High Current Enable */ -IOEX(EN_USB_A1_5V, EXPIN(USBC_PORT_C1, 1, 6), GPIO_OUT_LOW) /* A1 5V Source Enable */ -IOEX(USB_A1_CHARGE_EN_L, EXPIN(USBC_PORT_C1, 1, 7), GPIO_OUT_HIGH) /* A1 5V High Current Enable */ +IOEX(EN_USB_A1_5V_DB, EXPIN(USBC_PORT_C1, 1, 6), GPIO_OUT_LOW) /* A1 5V Source Enable */ +IOEX(USB_A1_CHARGE_EN_DB_L, EXPIN(USBC_PORT_C1, 1, 7), GPIO_OUT_HIGH) /* A1 5V High Current Enable */ /* * The NPCX LPC driver configures and controls SCI, so PCH_SCI_ODL [PIN(7, 6)] @@ -65,22 +65,22 @@ IOEX(USB_A1_CHARGE_EN_L, EXPIN(USBC_PORT_C1, 1, 7), GPIO_OUT_HIGH) /* A1 5V High */ /* I2C pins - these will be reconfigured for alternate function below */ -GPIO(I2C0_SCL, PIN(B, 5), GPIO_INPUT) /* EC_I2C_USB_A0_C0_SCL */ -GPIO(I2C0_SDA, PIN(B, 4), GPIO_INPUT) /* EC_I2C_USB_A0_C0_SDA */ -GPIO(I2C1_SCL, PIN(9, 0), GPIO_INPUT) /* EC_I2C_USB_A1_C1_SCL */ -GPIO(I2C1_SDA, PIN(8, 7), GPIO_INPUT) /* EC_I2C_USB_A1_C1_SDA */ -GPIO(I2C2_SCL, PIN(9, 2), GPIO_INPUT) /* EC_I2C_POWER_CBI_SCL */ -GPIO(I2C2_SDA, PIN(9, 1), GPIO_INPUT) /* EC_I2C_POWER_CBI_SDA */ -GPIO(I2C3_SCL, PIN(D, 1), GPIO_INPUT) /* EC_I2C_USBC_AP_MUX_SCL */ -GPIO(I2C3_SDA, PIN(D, 0), GPIO_INPUT) /* EC_I2C_USBC_AP_MUX_SDA */ -GPIO(I2C4_SCL, PIN(F, 3), GPIO_INPUT) /* FCH_SIC */ -GPIO(I2C4_SDA, PIN(F, 2), GPIO_INPUT) /* FCH_SID */ -GPIO(I2C5_SCL, PIN(3, 3), GPIO_INPUT | GPIO_SEL_1P8V) /* EC_I2C_SENSOR_SCL */ -GPIO(I2C5_SDA, PIN(3, 6), GPIO_INPUT | GPIO_SEL_1P8V) /* EC_I2C_SENSOR_SDA */ -GPIO(I2C6_SCL, PIN(E, 4), GPIO_INPUT | GPIO_SEL_1P8V) /* FCH_I2C_AUDIO_SCL */ -GPIO(I2C6_SDA, PIN(E, 3), GPIO_INPUT | GPIO_SEL_1P8V) /* FCH_I2C_AUDIO_SDA */ -GPIO(I2C7_SCL, PIN(B, 3), GPIO_INPUT) /* FCH_I2C_HDMI_HUB_3V3_SCL */ -GPIO(I2C7_SDA, PIN(B, 2), GPIO_INPUT) /* FCH_I2C_HDMI_HUB_3V3_SDA */ +GPIO(EC_I2C_USB_A0_C0_SCL, PIN(B, 5), GPIO_INPUT) +GPIO(EC_I2C_USB_A0_C0_SDA, PIN(B, 4), GPIO_INPUT) +GPIO(EC_I2C_USB_A1_C1_SCL, PIN(9, 0), GPIO_INPUT) +GPIO(EC_I2C_USB_A1_C1_SDA, PIN(8, 7), GPIO_INPUT) +GPIO(EC_I2C_POWER_CBI_SCL, PIN(9, 2), GPIO_INPUT) +GPIO(EC_I2C_POWER_CBI_SDA, PIN(9, 1), GPIO_INPUT) +GPIO(EC_I2C_USBC_AP_MUX_SCL, PIN(D, 1), GPIO_INPUT) +GPIO(EC_I2C_USBC_AP_MUX_SDA, PIN(D, 0), GPIO_INPUT) +GPIO(FCH_SIC, PIN(F, 3), GPIO_INPUT) +GPIO(FCH_SID, PIN(F, 2), GPIO_INPUT) +GPIO(EC_I2C_SENSOR_SCL, PIN(3, 3), GPIO_INPUT | GPIO_SEL_1P8V) +GPIO(EC_I2C_SENSOR_SDA, PIN(3, 6), GPIO_INPUT | GPIO_SEL_1P8V) +GPIO(FCH_I2C_AUDIO_SCL, PIN(E, 4), GPIO_INPUT | GPIO_SEL_1P8V) +GPIO(FCH_I2C_AUDIO_SDA, PIN(E, 3), GPIO_INPUT | GPIO_SEL_1P8V) +GPIO(FCH_I2C_HDMI_HUB_3V3_SCL, PIN(B, 3), GPIO_INPUT) +GPIO(FCH_I2C_HDMI_HUB_3V3_SDA, PIN(B, 2), GPIO_INPUT) ALTERNATE(PIN_MASK(6, BIT(4) | BIT(5)), 0, MODULE_UART, 0) /* Cr50 requires no pullups. */ @@ -103,7 +103,7 @@ ALTERNATE(PIN_MASK(4, BIT(0)), 0, MODULE_PWM, 0) /* TA1 - EC_FAN_SPEED */ ALTERNATE(PIN_MASK(3, 0x03), 0, MODULE_KEYBOARD_SCAN, GPIO_INPUT) /* KSI_00-01 */ ALTERNATE(PIN_MASK(2, 0xFC), 0, MODULE_KEYBOARD_SCAN, GPIO_INPUT) /* KSI_02-07 */ ALTERNATE(PIN_MASK(2, 0x03), 0, MODULE_KEYBOARD_SCAN, GPIO_ODR_HIGH) /* KSO_00-01 */ -GPIO(KBD_KSO2, PIN(1, 7), GPIO_OUT_LOW) /* KSO_02 inverted */ +GPIO(EC_KSO_02_INV, PIN(1, 7), GPIO_OUT_LOW) /* KSO_02 inverted */ ALTERNATE(PIN_MASK(1, 0x7F), 0, MODULE_KEYBOARD_SCAN, GPIO_ODR_HIGH) /* KSO_03-09 */ ALTERNATE(PIN_MASK(0, 0xE0), 0, MODULE_KEYBOARD_SCAN, GPIO_ODR_HIGH) /* KSO_10-12 */ |