diff options
Diffstat (limited to 'driver')
-rw-r--r-- | driver/retimer/bb_retimer.c | 4 | ||||
-rw-r--r-- | driver/retimer/kb800x.c | 2 | ||||
-rw-r--r-- | driver/tcpm/anx74xx.c | 20 | ||||
-rw-r--r-- | driver/tcpm/fusb302.c | 16 | ||||
-rw-r--r-- | driver/tcpm/it83xx.c | 26 | ||||
-rw-r--r-- | driver/tcpm/it8xxx2.c | 22 | ||||
-rw-r--r-- | driver/tcpm/ps8xxx.c | 6 | ||||
-rw-r--r-- | driver/tcpm/stm32gx.c | 2 | ||||
-rw-r--r-- | driver/tcpm/stub.c | 2 | ||||
-rw-r--r-- | driver/tcpm/tcpci.c | 2 |
10 files changed, 51 insertions, 51 deletions
diff --git a/driver/retimer/bb_retimer.c b/driver/retimer/bb_retimer.c index 43c67a95e1..75da6c653d 100644 --- a/driver/retimer/bb_retimer.c +++ b/driver/retimer/bb_retimer.c @@ -156,7 +156,7 @@ static void retimer_set_state_dfp(int port, mux_state_t mux_state, uint32_t *set_retimer_con) { union tbt_mode_resp_cable cable_resp = { - .raw_value = pd_get_tbt_mode_vdo(port, TCPC_TX_SOP_PRIME) }; + .raw_value = pd_get_tbt_mode_vdo(port, TCPCI_MSG_SOP_PRIME) }; union tbt_mode_resp_device dev_resp; enum idh_ptype cable_type = get_usb_pd_cable_type(port); @@ -188,7 +188,7 @@ static void retimer_set_state_dfp(int port, mux_state_t mux_state, if (mux_state & USB_PD_MUX_TBT_COMPAT_ENABLED || mux_state & USB_PD_MUX_USB4_ENABLED) { - dev_resp.raw_value = pd_get_tbt_mode_vdo(port, TCPC_TX_SOP); + dev_resp.raw_value = pd_get_tbt_mode_vdo(port, TCPCI_MSG_SOP); /* * Bit 2: RE_TIMER_DRIVER diff --git a/driver/retimer/kb800x.c b/driver/retimer/kb800x.c index ad615a3532..48e47404c2 100644 --- a/driver/retimer/kb800x.c +++ b/driver/retimer/kb800x.c @@ -340,7 +340,7 @@ static int kb800x_cio_init(const struct usb_mux *me, mux_state_t mux_state) enum idh_ptype cable_type = get_usb_pd_cable_type(me->usb_port); union tbt_mode_resp_cable cable_resp = { .raw_value = - pd_get_tbt_mode_vdo(me->usb_port, TCPC_TX_SOP_PRIME) + pd_get_tbt_mode_vdo(me->usb_port, TCPCI_MSG_SOP_PRIME) }; rv = kb800x_bulk_write(me, cio_init_addresses, cio_init_values, diff --git a/driver/tcpm/anx74xx.c b/driver/tcpm/anx74xx.c index 90834bff2e..567005920e 100644 --- a/driver/tcpm/anx74xx.c +++ b/driver/tcpm/anx74xx.c @@ -912,7 +912,7 @@ static int anx74xx_tcpm_get_message_raw(int port, uint32_t *payload, int *head) return anx74xx_read_pd_obj(port, (uint8_t *)payload, len); } -static int anx74xx_tcpm_transmit(int port, enum tcpm_sop_type type, +static int anx74xx_tcpm_transmit(int port, enum tcpci_msg_type type, uint16_t header, const uint32_t *data) { @@ -921,14 +921,14 @@ static int anx74xx_tcpm_transmit(int port, enum tcpm_sop_type type, switch (type) { /* ANX is aware of type */ - case TCPC_TX_SOP: - case TCPC_TX_SOP_PRIME: - case TCPC_TX_SOP_PRIME_PRIME: + case TCPCI_MSG_SOP: + case TCPCI_MSG_SOP_PRIME: + case TCPCI_MSG_SOP_PRIME_PRIME: len = PD_HEADER_CNT(header) * 4 + 2; ret = anx74xx_send_message(port, header, data, type, len); break; - case TCPC_TX_HARD_RESET: + case TCPCI_MSG_TX_HARD_RESET: /* Request HARD RESET */ tcpc_read(port, ANX74XX_REG_TX_CTRL_1, ®); reg |= ANX74XX_REG_TX_HARD_RESET_REQ; @@ -936,13 +936,13 @@ static int anx74xx_tcpm_transmit(int port, enum tcpm_sop_type type, /*After Hard Reset, TCPM shall disable goodCRC*/ anx74xx_tcpm_set_auto_good_crc(port, 0); break; - case TCPC_TX_CABLE_RESET: + case TCPCI_MSG_CABLE_RESET: /* Request CABLE RESET */ tcpc_read(port, ANX74XX_REG_TX_CTRL_1, ®); reg |= ANX74XX_REG_TX_CABLE_RESET_REQ; ret = tcpc_write(port, ANX74XX_REG_TX_CTRL_1, reg); break; - case TCPC_TX_BIST_MODE_2: + case TCPCI_MSG_TX_BIST_MODE_2: /* Request BIST MODE 2 */ reg = ANX74XX_REG_TX_BIST_START | ANX74XX_REG_TX_BIXT_FOREVER | (0x02 << 4); @@ -1028,9 +1028,9 @@ void anx74xx_tcpc_alert(int port) #ifdef CONFIG_USB_PD_DECODE_SOP if (reg & ANX74XX_REG_EXT_SOP) - msg_sop[port] = TCPC_TX_SOP; + msg_sop[port] = TCPCI_MSG_SOP; else if (reg & ANX74XX_REG_EXT_SOP_PRIME) - msg_sop[port] = TCPC_TX_SOP_PRIME; + msg_sop[port] = TCPCI_MSG_SOP_PRIME; #endif /* Check for Hard Reset done bit */ @@ -1045,7 +1045,7 @@ void anx74xx_tcpc_alert(int port) #ifdef CONFIG_USB_PD_DECODE_SOP if (reg & ANX74XX_REG_EXT_SOP_PRIME_PRIME) - msg_sop[port] = TCPC_TX_SOP_PRIME_PRIME; + msg_sop[port] = TCPCI_MSG_SOP_PRIME_PRIME; #endif if (reg & ANX74XX_REG_EXT_HARD_RST) { diff --git a/driver/tcpm/fusb302.c b/driver/tcpm/fusb302.c index 13df515041..0098906d32 100644 --- a/driver/tcpm/fusb302.c +++ b/driver/tcpm/fusb302.c @@ -836,16 +836,16 @@ static int fusb302_tcpm_get_message_raw(int port, uint32_t *payload, int *head) return EC_ERROR_UNKNOWN; if (reg & TCPC_REG_STATUS1_RXSOP1) - *head |= PD_HEADER_SOP(TCPC_TX_SOP_PRIME); + *head |= PD_HEADER_SOP(TCPCI_MSG_SOP_PRIME); else if (reg & TCPC_REG_STATUS1_RXSOP2) - *head |= PD_HEADER_SOP(TCPC_TX_SOP_PRIME_PRIME); + *head |= PD_HEADER_SOP(TCPCI_MSG_SOP_PRIME_PRIME); } #endif return rv; } -static int fusb302_tcpm_transmit(int port, enum tcpm_sop_type type, +static int fusb302_tcpm_transmit(int port, enum tcpci_msg_type type, uint16_t header, const uint32_t *data) { /* @@ -871,7 +871,7 @@ static int fusb302_tcpm_transmit(int port, enum tcpm_sop_type type, fusb302_flush_tx_fifo(port); switch (type) { - case TCPC_TX_SOP: + case TCPCI_MSG_SOP: /* put register address first for of burst tcpc write */ buf[buf_pos++] = TCPC_REG_FIFOS; @@ -883,7 +883,7 @@ static int fusb302_tcpm_transmit(int port, enum tcpm_sop_type type, buf[buf_pos++] = FUSB302_TKN_SYNC2; return fusb302_send_message(port, header, data, buf, buf_pos); - case TCPC_TX_SOP_PRIME: + case TCPCI_MSG_SOP_PRIME: /* put register address first for of burst tcpc write */ buf[buf_pos++] = TCPC_REG_FIFOS; @@ -895,7 +895,7 @@ static int fusb302_tcpm_transmit(int port, enum tcpm_sop_type type, buf[buf_pos++] = FUSB302_TKN_SYNC3; return fusb302_send_message(port, header, data, buf, buf_pos); - case TCPC_TX_SOP_PRIME_PRIME: + case TCPCI_MSG_SOP_PRIME_PRIME: /* put register address first for of burst tcpc write */ buf[buf_pos++] = TCPC_REG_FIFOS; @@ -907,14 +907,14 @@ static int fusb302_tcpm_transmit(int port, enum tcpm_sop_type type, buf[buf_pos++] = FUSB302_TKN_SYNC3; return fusb302_send_message(port, header, data, buf, buf_pos); - case TCPC_TX_HARD_RESET: + case TCPCI_MSG_TX_HARD_RESET: /* Simply hit the SEND_HARD_RESET bit */ tcpc_read(port, TCPC_REG_CONTROL3, ®); reg |= TCPC_REG_CONTROL3_SEND_HARDRESET; tcpc_write(port, TCPC_REG_CONTROL3, reg); break; - case TCPC_TX_BIST_MODE_2: + case TCPCI_MSG_TX_BIST_MODE_2: /* Hit the BIST_MODE2 bit and start TX */ tcpc_read(port, TCPC_REG_CONTROL1, ®); reg |= TCPC_REG_CONTROL1_BIST_MODE2; diff --git a/driver/tcpm/it83xx.c b/driver/tcpm/it83xx.c index 6c9092613b..964d5f09d2 100644 --- a/driver/tcpm/it83xx.c +++ b/driver/tcpm/it83xx.c @@ -178,7 +178,7 @@ static int it83xx_tcpm_get_message_raw(int port, uint32_t *buf, int *head) static enum tcpc_transmit_complete it83xx_tx_data( enum usbpd_port port, - enum tcpm_sop_type type, + enum tcpci_msg_type type, uint16_t header, const uint32_t *buf) { @@ -200,7 +200,7 @@ static enum tcpc_transmit_complete it83xx_tx_data( IT83XX_USBPD_MTSR1(port) = (IT83XX_USBPD_MTSR1(port) & ~0x70) | ((type & 0x7) << 4); /* bit7: transmit message is send to cable or not */ - if (TCPC_TX_SOP == type) + if (type == TCPCI_MSG_SOP) IT83XX_USBPD_MTSR0(port) &= ~USBPD_REG_MASK_CABLE_ENABLE; else IT83XX_USBPD_MTSR0(port) |= USBPD_REG_MASK_CABLE_ENABLE; @@ -247,9 +247,9 @@ static enum tcpc_transmit_complete it83xx_tx_data( } static enum tcpc_transmit_complete it83xx_send_hw_reset(enum usbpd_port port, - enum tcpm_sop_type reset_type) + enum tcpci_msg_type reset_type) { - if (reset_type == TCPC_TX_CABLE_RESET) + if (reset_type == TCPCI_MSG_CABLE_RESET) IT83XX_USBPD_MTSR0(port) |= USBPD_REG_MASK_CABLE_ENABLE; else IT83XX_USBPD_MTSR0(port) &= ~USBPD_REG_MASK_CABLE_ENABLE; @@ -678,29 +678,29 @@ static int it83xx_tcpm_set_rx_enable(int port, int enable) } static int it83xx_tcpm_transmit(int port, - enum tcpm_sop_type type, + enum tcpci_msg_type type, uint16_t header, const uint32_t *data) { int status = TCPC_TX_COMPLETE_FAILED; switch (type) { - case TCPC_TX_SOP: - case TCPC_TX_SOP_PRIME: - case TCPC_TX_SOP_PRIME_PRIME: - case TCPC_TX_SOP_DEBUG_PRIME: - case TCPC_TX_SOP_DEBUG_PRIME_PRIME: + case TCPCI_MSG_SOP: + case TCPCI_MSG_SOP_PRIME: + case TCPCI_MSG_SOP_PRIME_PRIME: + case TCPCI_MSG_SOP_DEBUG_PRIME: + case TCPCI_MSG_SOP_DEBUG_PRIME_PRIME: status = it83xx_tx_data(port, type, header, data); break; - case TCPC_TX_BIST_MODE_2: + case TCPCI_MSG_TX_BIST_MODE_2: it83xx_send_bist_mode2_pattern(port); status = TCPC_TX_COMPLETE_SUCCESS; break; - case TCPC_TX_HARD_RESET: - case TCPC_TX_CABLE_RESET: + case TCPCI_MSG_TX_HARD_RESET: + case TCPCI_MSG_CABLE_RESET: status = it83xx_send_hw_reset(port, type); break; default: diff --git a/driver/tcpm/it8xxx2.c b/driver/tcpm/it8xxx2.c index bdf7de0b9f..e3227a3ed8 100644 --- a/driver/tcpm/it8xxx2.c +++ b/driver/tcpm/it8xxx2.c @@ -170,7 +170,7 @@ static int it8xxx2_tcpm_get_message_raw(int port, uint32_t *buf, int *head) * BIT[6:4] SOP type of Rx message * 000b=SOP, 001b=SOP', 010b=SOP", 011b=Debug SOP', 100b=Debug SOP" * 101b=HRDRST, 110b=CBLRST - * 000b~100b is aligned to enum tcpm_sop_type. + * 000b~100b is aligned to enum tcpci_msg_type. * */ if (IS_ENABLED(CONFIG_USB_PD_DECODE_SOP)) @@ -197,7 +197,7 @@ void it8xxx2_get_tx_error_status(enum usbpd_port port) } static enum tcpc_transmit_complete it8xxx2_tx_data(enum usbpd_port port, - enum tcpm_sop_type type, + enum tcpci_msg_type type, uint16_t header, const uint32_t *buf) { @@ -595,31 +595,31 @@ static int it8xxx2_tcpm_set_rx_enable(int port, int enable) } static int it8xxx2_tcpm_transmit(int port, - enum tcpm_sop_type type, + enum tcpci_msg_type type, uint16_t header, const uint32_t *data) { int status = TCPC_TX_COMPLETE_FAILED; switch (type) { - case TCPC_TX_SOP: - case TCPC_TX_SOP_PRIME: - case TCPC_TX_SOP_PRIME_PRIME: - case TCPC_TX_SOP_DEBUG_PRIME: - case TCPC_TX_SOP_DEBUG_PRIME_PRIME: + case TCPCI_MSG_SOP: + case TCPCI_MSG_SOP_PRIME: + case TCPCI_MSG_SOP_PRIME_PRIME: + case TCPCI_MSG_SOP_DEBUG_PRIME: + case TCPCI_MSG_SOP_DEBUG_PRIME_PRIME: status = it8xxx2_tx_data(port, type, header, data); break; - case TCPC_TX_BIST_MODE_2: + case TCPCI_MSG_TX_BIST_MODE_2: it8xxx2_send_bist_mode2_pattern(port); status = TCPC_TX_COMPLETE_SUCCESS; break; - case TCPC_TX_HARD_RESET: + case TCPCI_MSG_TX_HARD_RESET: status = it8xxx2_send_hw_reset(port); break; - case TCPC_TX_CABLE_RESET: + case TCPCI_MSG_CABLE_RESET: status = it8xxx2_send_cable_reset(port); break; default: diff --git a/driver/tcpm/ps8xxx.c b/driver/tcpm/ps8xxx.c index ade607ac09..1742f19aeb 100644 --- a/driver/tcpm/ps8xxx.c +++ b/driver/tcpm/ps8xxx.c @@ -426,15 +426,15 @@ static int ps8xxx_tcpc_bist_mode_2(int port) rv |= tcpc_write(port, PS8XXX_REG_BIST_CONT_MODE_CTR, 0); /* Start BIST MODE 2 */ - rv |= tcpc_write(port, TCPC_REG_TRANSMIT, TCPC_TX_BIST_MODE_2); + rv |= tcpc_write(port, TCPC_REG_TRANSMIT, TCPCI_MSG_TX_BIST_MODE_2); return rv; } -static int ps8xxx_tcpm_transmit(int port, enum tcpm_sop_type type, +static int ps8xxx_tcpm_transmit(int port, enum tcpci_msg_type type, uint16_t header, const uint32_t *data) { - if (type == TCPC_TX_BIST_MODE_2) + if (type == TCPCI_MSG_TX_BIST_MODE_2) return ps8xxx_tcpc_bist_mode_2(port); else return tcpci_tcpm_transmit(port, type, header, data); diff --git a/driver/tcpm/stm32gx.c b/driver/tcpm/stm32gx.c index 4b33f32209..359c7c1108 100644 --- a/driver/tcpm/stm32gx.c +++ b/driver/tcpm/stm32gx.c @@ -103,7 +103,7 @@ static int stm32gx_tcpm_set_rx_enable(int port, int enable) } static int stm32gx_tcpm_transmit(int port, - enum tcpm_sop_type type, + enum tcpci_msg_type type, uint16_t header, const uint32_t *data) { diff --git a/driver/tcpm/stub.c b/driver/tcpm/stub.c index 48c0c51da9..863a88c044 100644 --- a/driver/tcpm/stub.c +++ b/driver/tcpm/stub.c @@ -113,7 +113,7 @@ void tcpm_clear_pending_messages(int port) rx_buf_clear(port); } -int tcpm_transmit(int port, enum tcpm_sop_type type, uint16_t header, +int tcpm_transmit(int port, enum tcpci_msg_type type, uint16_t header, const uint32_t *data) { return tcpc_transmit(port, type, header, data); diff --git a/driver/tcpm/tcpci.c b/driver/tcpm/tcpci.c index 6674b67c02..282718bae2 100644 --- a/driver/tcpm/tcpci.c +++ b/driver/tcpm/tcpci.c @@ -944,7 +944,7 @@ void tcpm_clear_pending_messages(int port) q->tail = q->head; } -int tcpci_tcpm_transmit(int port, enum tcpm_sop_type type, +int tcpci_tcpm_transmit(int port, enum tcpci_msg_type type, uint16_t header, const uint32_t *data) { int reg = TCPC_REG_TX_DATA; |