diff options
-rw-r--r-- | board/cr50/board.c | 2 | ||||
-rw-r--r-- | board/cr50/gpio.inc | 24 | ||||
-rw-r--r-- | chip/g/i2cs.c | 4 | ||||
-rw-r--r-- | common/i2cs_tpm.c | 8 | ||||
-rw-r--r-- | include/i2c.h | 2 |
5 files changed, 20 insertions, 20 deletions
diff --git a/board/cr50/board.c b/board/cr50/board.c index 0dd9e5ef5d..6be3dff779 100644 --- a/board/cr50/board.c +++ b/board/cr50/board.c @@ -1820,7 +1820,7 @@ void board_unwedge_i2cp(void) GWRITE(PINMUX, GPIO1_GPIO5_SEL, GC_PINMUX_I2CS0_SCL_SEL); /* Generate a 'stop' condition. */ - gpio_set_level(GPIO_UNWEDGE_I2CS_SCL, 1); + gpio_set_level(GPIO_UNWEDGE_I2CP_SCL, 1); usleep(2); GWRITE_FIELD(I2CS, CTRL_SDA_VAL, READ0_S, 1); usleep(2); diff --git a/board/cr50/gpio.inc b/board/cr50/gpio.inc index 0efac639aa..b0693b1930 100644 --- a/board/cr50/gpio.inc +++ b/board/cr50/gpio.inc @@ -61,15 +61,15 @@ * GPIO0.11 en_pp3300_ina * GPIO0.12 i2c_scl_ina * GPIO0.13 i2c_sda_ina - * GPIO0.14 i2cs_sda poll + * GPIO0.14 i2cp_sda poll * GPIO0.15 ec_tx_cr50_rx_out * GPIO1.0 tpm_rst_l * GPIO1.1 detect_ap_uart * GPIO1.2 detect_ec_uart * GPIO1.3 detect_servo * GPIO1.4 detect_tpm_rst_asserted - * GPIO1.5 unwedge_i2cs_scl - * GPIO1.6 monitor_i2cs_sda + * GPIO1.5 unwedge_i2cp_scl + * GPIO1.6 monitor_i2cp_sda * GPIO1.7 ec_packet_mode_en * GPIO1.8 ec_packet_mode_dis * GPIO1.10 rec_lid_switch @@ -110,13 +110,13 @@ GPIO_INT(DETECT_TPM_RST_L_ASSERTED, PIN(1, 4), GPIO_INT_FALLING, tpm_rst_asserted) /* - * A GPIO to sample the current state of the I2CS SDA line, allowing to detect + * A GPIO to sample the current state of the I2CP SDA line, allowing to detect * the 'wedged I2C bus' condition. * * Also, it works to detect an I2C transaction during extended INT_AP_L * assertion. */ -GPIO_INT(MONITOR_I2CS_SDA, PIN(1, 6), GPIO_INT_LOW, i2cp_sda_isr) +GPIO_INT(MONITOR_I2CP_SDA, PIN(1, 6), GPIO_INT_LOW, i2cp_sda_isr) /* * These GPIOs are to enable or disable EC-CR50 communication. @@ -194,7 +194,7 @@ GPIO(STRAP_A1, PIN(1, 13), GPIO_INPUT) GPIO(STRAP_B0, PIN(1, 14), GPIO_INPUT) GPIO(STRAP_B1, PIN(1, 15), GPIO_INPUT) -GPIO(UNWEDGE_I2CS_SCL, PIN(1, 5), GPIO_OUT_HIGH) +GPIO(UNWEDGE_I2CP_SCL, PIN(1, 5), GPIO_OUT_HIGH) /* * If you change the names of EN_PP3300_INA_L, I2C_SCL_INA, or I2C_SDA_INA, @@ -207,15 +207,15 @@ GPIO(I2C_SCL_INA, PIN(0, 12), GPIO_INPUT) GPIO(I2C_SDA_INA, PIN(0, 13), GPIO_INPUT) /* - * Use this to poll the state of the I2CS SDA line. Note that this is not + * Use this to poll the state of the I2CP SDA line. Note that this is not * necessary if SPI interface is used to communicate with the AP, if needed, * this GPIO could be reclaimed in that case. * * Actual attachment of this GPIO to the SDA line happens in board.c only when - * I2CS interface is required. Should this GPIO ever change, the code setting + * I2CP interface is required. Should this GPIO ever change, the code setting * up the pinmux in board.c will have to change as well. */ -GPIO(I2CS_SDA, PIN(0, 14), GPIO_INPUT) +GPIO(I2CP_SDA, PIN(0, 14), GPIO_INPUT) /* * Fake open drain on EC_TX_CR50_RX_OUT. When asserted, the signal can be used * to enable UART programming mode on the EC. The signal needs to fake open @@ -245,7 +245,7 @@ PINMUX(GPIO(INT_AP_L), A5, DIO_INPUT) PINMUX(GPIO(DIOM4), M4, DIO_INPUT | GPIO_PULL_UP) PINMUX(GPIO(EC_FLASH_SELECT), B2, DIO_INPUT) -PINMUX(GPIO(MONITOR_I2CS_SDA), A1, GPIO_INPUT) +PINMUX(GPIO(MONITOR_I2CP_SDA), A1, GPIO_INPUT) /* * Update closed_source_set1.c if pinmux for EN_PP3300_INA_L is changed or @@ -290,9 +290,9 @@ PINMUX(GPIO(EC_TX_CR50_RX_OUT), B6, DIO_INPUT) PINMUX(GPIO(DETECT_SERVO), B5, DIO_INPUT) /* - * I2CS pins are bi-directional and would be configured here as shown. However, + * I2CP pins are bi-directional and would be configured here as shown. However, * A1 is also used as a strapping option GPIO input which is configured - * above. If a board is configured (via the strapping pins) to support the I2CS + * above. If a board is configured (via the strapping pins) to support the I2CP * interface, then the connection of A1 and A9 to/from the I2C0_SDA and I2C0_SCL * lines is done in the function i2cp_set_pinmux() which lives in board.c. * diff --git a/chip/g/i2cs.c b/chip/g/i2cs.c index 72a569bd99..bf1f3f1ac3 100644 --- a/chip/g/i2cs.c +++ b/chip/g/i2cs.c @@ -106,7 +106,7 @@ static uint16_t i2cp_sda_low_count; static void check_i2cp_state(void) { - if (gpio_get_level(GPIO_MONITOR_I2CS_SDA)) + if (gpio_get_level(GPIO_MONITOR_I2CP_SDA)) return; /* @@ -221,7 +221,7 @@ DECLARE_DEFERRED(poll_read_state); */ static void poll_read_state(void) { - if (!ap_is_on() || gpio_get_level(GPIO_I2CS_SDA)) { + if (!ap_is_on() || gpio_get_level(GPIO_I2CP_SDA)) { /* * When the AP is off, the SDA line might drop low since the * pull ups might not be powered. diff --git a/common/i2cs_tpm.c b/common/i2cs_tpm.c index 0d5b8e7e00..362fc57c4d 100644 --- a/common/i2cs_tpm.c +++ b/common/i2cs_tpm.c @@ -129,7 +129,7 @@ static void process_read_access(uint16_t reg_size, /* Back pointer up by one to point to beginning of buffer */ data -= 1; tpm_register_get(tpm_reg, data, reg_size); - /* Transfer TPM fifo data to the I2CS HW fifo */ + /* Transfer TPM fifo data to the I2CP HW fifo */ i2cp_post_read_fill_fifo(data, reg_size); } @@ -206,7 +206,7 @@ static void wr_complete_handler(void *i2cp_data, size_t i2cp_data_size) data, i2cp_data_size); if (assert_int_ap()) { - gpio_enable_interrupt(GPIO_MONITOR_I2CS_SDA); + gpio_enable_interrupt(GPIO_MONITOR_I2CP_SDA); return; } @@ -224,7 +224,7 @@ static void wr_complete_handler(void *i2cp_data, size_t i2cp_data_size) void i2cp_sda_isr(enum gpio_signal signal) { - gpio_disable_interrupt(GPIO_MONITOR_I2CS_SDA); + gpio_disable_interrupt(GPIO_MONITOR_I2CP_SDA); deassert_int_ap(); } @@ -242,7 +242,7 @@ static void i2cp_if_start(void) i2cp_register_write_complete_handler(wr_complete_handler); } -/* Function that sets up for I2CS to enable INT_AP_L extension. */ +/* Function that sets up for I2CP to enable INT_AP_L extension. */ static void i2cp_int_ap_extension_enable_(void) { int_ap_extension_enabled_ = true; diff --git a/include/i2c.h b/include/i2c.h index 83cd05b77a..c3cfa08548 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -520,7 +520,7 @@ void i2c_trace_notify(int port, uint16_t periph_addr_flags, int direction, const uint8_t *data, size_t size); /* - * Interrupt handler of GPIO_MONITOR_I2CS_SDA. + * Interrupt handler of GPIO_MONITOR_I2CP_SDA. * Its role is to detect any transaction start during INT_AP_L * assertion and to deassert INT_AP_L. */ |