summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Rosenthal <jrosenth@chromium.org>2022-06-27 14:55:07 -0600
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-06-30 21:13:30 +0000
commit4528f10f80c8ece53f7d08cca7988436b47df16e (patch)
tree3534b9506bbb6ee54b05c955bc0f050b1fd5899b
parent031c893beb527072c6b3832b17992368c85cd273 (diff)
downloadchrome-ec-4528f10f80c8ece53f7d08cca7988436b47df16e.tar.gz
driver/tcpm/ps8xxx.c: Format with clang-format
BUG=b:236386294 BRANCH=none TEST=none Change-Id: Ied16cfb6c772e948058284251917ba3f9b5b5983 Signed-off-by: Jack Rosenthal <jrosenth@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3730082 Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
-rw-r--r--driver/tcpm/ps8xxx.c193
1 files changed, 89 insertions, 104 deletions
diff --git a/driver/tcpm/ps8xxx.c b/driver/tcpm/ps8xxx.c
index 212a7f10dd..0ffd69364a 100644
--- a/driver/tcpm/ps8xxx.c
+++ b/driver/tcpm/ps8xxx.c
@@ -23,7 +23,7 @@
#include "usb_mux.h"
#include "usb_pd.h"
-#if !defined(CONFIG_USB_PD_TCPM_PS8705) && \
+#if !defined(CONFIG_USB_PD_TCPM_PS8705) && \
!defined(CONFIG_USB_PD_TCPM_PS8751) && \
!defined(CONFIG_USB_PD_TCPM_PS8755) && \
!defined(CONFIG_USB_PD_TCPM_PS8805) && \
@@ -31,8 +31,7 @@
#error "Unsupported PS8xxx TCPC."
#endif
-#if !defined(CONFIG_USB_PD_TCPM_TCPCI) || \
- !defined(CONFIG_USB_PD_TCPM_MUX) || \
+#if !defined(CONFIG_USB_PD_TCPM_TCPCI) || !defined(CONFIG_USB_PD_TCPM_MUX) || \
!defined(CONFIG_USBC_SS_MUX)
#error "PS8XXX is using a standard TCPCI interface with integrated mux control"
@@ -55,10 +54,10 @@
#endif /* CONFIG_USB_PD_TCPM_PS8751_CUSTOM_MUX_DRIVER */
-#define CPRINTF(format, args...) cprintf(CC_USBPD, format, ## args)
-#define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args)
+#define CPRINTF(format, args...) cprintf(CC_USBPD, format, ##args)
+#define CPRINTS(format, args...) cprints(CC_USBPD, format, ##args)
-#define PS8XXX_I2C_RECOVERY_DELAY_MS 10
+#define PS8XXX_I2C_RECOVERY_DELAY_MS 10
/*
* The product_id per ports here is expected to be set in callback function -
@@ -94,7 +93,7 @@ static uint64_t hpd_deadline[CONFIG_USB_PD_PORT_MAX_COUNT];
void ps8xxx_wake_from_standby(const struct usb_mux *me);
-#if defined(CONFIG_USB_PD_TCPM_PS8705) || \
+#if defined(CONFIG_USB_PD_TCPM_PS8705) || \
defined(CONFIG_USB_PD_TCPM_PS8751) || \
defined(CONFIG_USB_PD_TCPM_PS8755) || \
defined(CONFIG_USB_PD_TCPM_PS8805)
@@ -122,7 +121,7 @@ static int ps8xxx_addr_dci_disable(int port, int i2c_addr, int i2c_reg)
}
#endif /* CONFIG_USB_PD_TCPM_PS875[15] || CONFIG_USB_PD_TCPM_PS8[78]05 */
-#if defined(CONFIG_USB_PD_TCPM_PS8705) || \
+#if defined(CONFIG_USB_PD_TCPM_PS8705) || \
defined(CONFIG_USB_PD_TCPM_PS8755) || \
defined(CONFIG_USB_PD_TCPM_PS8805)
static int ps8705_dci_disable(int port)
@@ -191,8 +190,8 @@ int ps8805_gpio_set_level(int port, enum ps8805_gpio signal, int level)
return EC_ERROR_INVAL;
rv = i2c_read8(tcpc_config[port].i2c_info.port,
- PS8805_VENDOR_DEFINED_I2C_ADDR,
- PS8805_REG_GPIO_CONTROL, &regval);
+ PS8805_VENDOR_DEFINED_I2C_ADDR, PS8805_REG_GPIO_CONTROL,
+ &regval);
if (rv)
return rv;
@@ -203,8 +202,8 @@ int ps8805_gpio_set_level(int port, enum ps8805_gpio signal, int level)
regval &= ~mask;
return i2c_write8(tcpc_config[port].i2c_info.port,
- PS8805_VENDOR_DEFINED_I2C_ADDR,
- PS8805_REG_GPIO_CONTROL, regval);
+ PS8805_VENDOR_DEFINED_I2C_ADDR,
+ PS8805_REG_GPIO_CONTROL, regval);
}
int ps8805_gpio_get_level(int port, enum ps8805_gpio signal, int *level)
@@ -216,8 +215,8 @@ int ps8805_gpio_get_level(int port, enum ps8805_gpio signal, int *level)
return EC_ERROR_INVAL;
rv = i2c_read8(tcpc_config[port].i2c_info.port,
- PS8805_VENDOR_DEFINED_I2C_ADDR,
- PS8805_REG_GPIO_CONTROL, &regval);
+ PS8805_VENDOR_DEFINED_I2C_ADDR, PS8805_REG_GPIO_CONTROL,
+ &regval);
if (rv)
return rv;
*level = !!(regval & ps8805_gpio_mask[signal]);
@@ -245,49 +244,39 @@ struct ps8xxx_variant_map {
*/
static struct ps8xxx_variant_map variant_map[] = {
#ifdef CONFIG_USB_PD_TCPM_PS8705
- {
- PS8705_PRODUCT_ID,
- ps8705_dci_disable,
- {
- [REG_FW_VER] = 0x82,
- }
- },
+ { PS8705_PRODUCT_ID,
+ ps8705_dci_disable,
+ {
+ [REG_FW_VER] = 0x82,
+ } },
#endif
#ifdef CONFIG_USB_PD_TCPM_PS8751
- {
- PS8751_PRODUCT_ID,
- ps8751_dci_disable,
- {
- [REG_FW_VER] = 0x90,
- }
- },
+ { PS8751_PRODUCT_ID,
+ ps8751_dci_disable,
+ {
+ [REG_FW_VER] = 0x90,
+ } },
#endif
#ifdef CONFIG_USB_PD_TCPM_PS8755
- {
- PS8755_PRODUCT_ID,
- ps8705_dci_disable,
- {
- [REG_FW_VER] = 0x82,
- }
- },
+ { PS8755_PRODUCT_ID,
+ ps8705_dci_disable,
+ {
+ [REG_FW_VER] = 0x82,
+ } },
#endif
#ifdef CONFIG_USB_PD_TCPM_PS8805
- {
- PS8805_PRODUCT_ID,
- ps8705_dci_disable,
- {
- [REG_FW_VER] = 0x82,
- }
- },
+ { PS8805_PRODUCT_ID,
+ ps8705_dci_disable,
+ {
+ [REG_FW_VER] = 0x82,
+ } },
#endif
#ifdef CONFIG_USB_PD_TCPM_PS8815
- {
- PS8815_PRODUCT_ID,
- ps8815_dci_disable,
- {
- [REG_FW_VER] = 0x82,
- }
- },
+ { PS8815_PRODUCT_ID,
+ ps8815_dci_disable,
+ {
+ [REG_FW_VER] = 0x82,
+ } },
#endif
};
@@ -300,8 +289,7 @@ static int get_reg_by_product(const int port,
return INT32_MAX;
for (i = 0; i < ARRAY_SIZE(variant_map); i++) {
- if (product_id[port] ==
- variant_map[i].product_id) {
+ if (product_id[port] == variant_map[i].product_id) {
return variant_map[i].reg_map[reg];
}
}
@@ -341,8 +329,7 @@ static int dp_set_irq(const struct usb_mux *me, int enable)
}
/* LCOV_EXCL_START */
-__overridable
-uint16_t board_get_ps8xxx_product_id(int port)
+__overridable uint16_t board_get_ps8xxx_product_id(int port)
{
/* Board supporting multiple chip sources in ps8xxx.c MUST override this
* function to judge the real chip source for this board. For example,
@@ -385,8 +372,7 @@ bool check_ps8755_chip(int port)
}
void ps8xxx_tcpc_update_hpd_status(const struct usb_mux *me,
- mux_state_t mux_state,
- bool *ack_required)
+ mux_state_t mux_state, bool *ack_required)
{
int port = me->usb_port;
int hpd_lvl = (mux_state & USB_PD_MUX_HPD_LVL) ? 1 : 0;
@@ -421,12 +407,12 @@ static int ps8xxx_tcpc_bist_mode_2(int port)
int rv;
/* Generate BIST for 50ms. */
- rv = tcpc_write(port,
- PS8XXX_REG_BIST_CONT_MODE_BYTE0, PS8751_BIST_COUNTER_BYTE0);
- rv |= tcpc_write(port,
- PS8XXX_REG_BIST_CONT_MODE_BYTE1, PS8751_BIST_COUNTER_BYTE1);
- rv |= tcpc_write(port,
- PS8XXX_REG_BIST_CONT_MODE_BYTE2, PS8751_BIST_COUNTER_BYTE2);
+ rv = tcpc_write(port, PS8XXX_REG_BIST_CONT_MODE_BYTE0,
+ PS8751_BIST_COUNTER_BYTE0);
+ rv |= tcpc_write(port, PS8XXX_REG_BIST_CONT_MODE_BYTE1,
+ PS8751_BIST_COUNTER_BYTE1);
+ rv |= tcpc_write(port, PS8XXX_REG_BIST_CONT_MODE_BYTE2,
+ PS8751_BIST_COUNTER_BYTE2);
/* Auto stop */
rv |= tcpc_write(port, PS8XXX_REG_BIST_CONT_MODE_CTR, 0);
@@ -438,7 +424,7 @@ static int ps8xxx_tcpc_bist_mode_2(int port)
}
static int ps8xxx_tcpm_transmit(int port, enum tcpci_msg_type type,
- uint16_t header, const uint32_t *data)
+ uint16_t header, const uint32_t *data)
{
if (type == TCPCI_MSG_TX_BIST_MODE_2)
return ps8xxx_tcpc_bist_mode_2(port);
@@ -472,7 +458,7 @@ static void ps8xxx_role_control_delay(int port)
#ifdef CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE
static int ps8xxx_set_role_ctrl(int port, enum tcpc_drp drp,
- enum tcpc_rp_value rp, enum tcpc_cc_pull pull)
+ enum tcpc_rp_value rp, enum tcpc_cc_pull pull)
{
int rv;
@@ -518,7 +504,7 @@ static int ps8xxx_tcpc_drp_toggle(int port)
/* Set auto drp toggle, starting with the opposite pull */
rv |= ps8xxx_set_role_ctrl(port, TYPEC_DRP, TYPEC_RP_USB,
- opposite_pull);
+ opposite_pull);
/* Set Look4Connection command */
rv |= tcpc_write(port, TCPC_REG_COMMAND,
@@ -645,7 +631,7 @@ static int ps8xxx_lpm_recovery_delay(int port)
}
static int ps8xxx_get_chip_info(int port, int live,
- struct ec_response_pd_chip_info_v1 *chip_info)
+ struct ec_response_pd_chip_info_v1 *chip_info)
{
int val;
int reg;
@@ -694,10 +680,10 @@ static int ps8xxx_get_chip_info(int port, int live,
chip_info->fw_version_number = val;
/* Treat unexpected values as error (FW not initiated from reset) */
- if (live && (
- chip_info->vendor_id != PS8XXX_VENDOR_ID ||
- chip_info->product_id != board_get_ps8xxx_product_id(port) ||
- chip_info->fw_version_number == 0))
+ if (live &&
+ (chip_info->vendor_id != PS8XXX_VENDOR_ID ||
+ chip_info->product_id != board_get_ps8xxx_product_id(port) ||
+ chip_info->fw_version_number == 0))
return EC_ERROR_UNKNOWN;
#if defined(CONFIG_USB_PD_TCPM_PS8751) && \
@@ -721,7 +707,7 @@ static int ps8xxx_enter_low_power_mode(int port)
* don't have it. Stub it out for PS8751/PS8815.
*/
if (product_id[port] == PS8751_PRODUCT_ID ||
- product_id[port] == PS8815_PRODUCT_ID)
+ product_id[port] == PS8815_PRODUCT_ID)
return EC_SUCCESS;
return tcpci_enter_low_power_mode(port);
@@ -736,8 +722,7 @@ __maybe_unused static int ps8815_tcpc_fast_role_swap_enable(int port,
if (!tcpm_tcpc_has_frs_control(port))
return EC_SUCCESS;
- status = tcpc_update8(port,
- PS8815_REG_RESERVED_F4,
+ status = tcpc_update8(port, PS8815_REG_RESERVED_F4,
PS8815_REG_RESERVED_F4_FRS_EN,
enable ? MASK_SET : MASK_CLR);
if (status != EC_SUCCESS)
@@ -816,7 +801,8 @@ __maybe_unused static int ps8815_disable_rp_detect_workaround_check(int port)
}
__overridable void board_ps8xxx_tcpc_init(int port)
-{}
+{
+}
static int ps8xxx_tcpm_init(int port)
{
@@ -848,8 +834,7 @@ static int ps8xxx_tcpm_init(int port)
* set reg 0xf4.FRS_EN (drive FRS GPIO to PPC)
*/
if (tcpm_tcpc_has_frs_control(port)) {
- status = tcpc_update8(port,
- PS8815_REG_RESERVED_D1,
+ status = tcpc_update8(port, PS8815_REG_RESERVED_D1,
PS8815_REG_RESERVED_D1_FRS_EN,
MASK_SET);
if (status != EC_SUCCESS)
@@ -884,7 +869,7 @@ static int ps8xxx_tcpm_init(int port)
* delay will allow the transient to disappear.
*/
static int ps8751_get_gcc(int port, enum tcpc_cc_voltage_status *cc1,
- enum tcpc_cc_voltage_status *cc2)
+ enum tcpc_cc_voltage_status *cc2)
{
int rv;
int status;
@@ -932,7 +917,7 @@ static int ps8xxx_tcpm_set_cc(int port, int pull)
}
static int ps8xxx_tcpm_get_cc(int port, enum tcpc_cc_voltage_status *cc1,
- enum tcpc_cc_voltage_status *cc2)
+ enum tcpc_cc_voltage_status *cc2)
{
#ifdef CONFIG_USB_PD_TCPM_PS8751
if (product_id[port] == PS8751_PRODUCT_ID)
@@ -957,39 +942,39 @@ static int ps8xxx_tcpm_set_vconn(int port, int enable)
}
const struct tcpm_drv ps8xxx_tcpm_drv = {
- .init = ps8xxx_tcpm_init,
- .release = ps8xxx_tcpm_release,
- .get_cc = ps8xxx_tcpm_get_cc,
+ .init = ps8xxx_tcpm_init,
+ .release = ps8xxx_tcpm_release,
+ .get_cc = ps8xxx_tcpm_get_cc,
#ifdef CONFIG_USB_PD_VBUS_DETECT_TCPC
- .check_vbus_level = tcpci_tcpm_check_vbus_level,
+ .check_vbus_level = tcpci_tcpm_check_vbus_level,
#endif
- .select_rp_value = tcpci_tcpm_select_rp_value,
- .set_cc = ps8xxx_tcpm_set_cc,
- .set_polarity = tcpci_tcpm_set_polarity,
+ .select_rp_value = tcpci_tcpm_select_rp_value,
+ .set_cc = ps8xxx_tcpm_set_cc,
+ .set_polarity = tcpci_tcpm_set_polarity,
#ifdef CONFIG_USB_PD_DECODE_SOP
- .sop_prime_enable = tcpci_tcpm_sop_prime_enable,
+ .sop_prime_enable = tcpci_tcpm_sop_prime_enable,
#endif
- .set_vconn = ps8xxx_tcpm_set_vconn,
- .set_msg_header = tcpci_tcpm_set_msg_header,
- .set_rx_enable = tcpci_tcpm_set_rx_enable,
- .get_message_raw = tcpci_tcpm_get_message_raw,
- .transmit = ps8xxx_tcpm_transmit,
- .tcpc_alert = tcpci_tcpc_alert,
+ .set_vconn = ps8xxx_tcpm_set_vconn,
+ .set_msg_header = tcpci_tcpm_set_msg_header,
+ .set_rx_enable = tcpci_tcpm_set_rx_enable,
+ .get_message_raw = tcpci_tcpm_get_message_raw,
+ .transmit = ps8xxx_tcpm_transmit,
+ .tcpc_alert = tcpci_tcpc_alert,
#ifdef CONFIG_USB_PD_DISCHARGE_TCPC
- .tcpc_discharge_vbus = tcpci_tcpc_discharge_vbus,
+ .tcpc_discharge_vbus = tcpci_tcpc_discharge_vbus,
#endif
#ifdef CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE
- .drp_toggle = ps8xxx_tcpc_drp_toggle,
+ .drp_toggle = ps8xxx_tcpc_drp_toggle,
#endif
- .get_chip_info = ps8xxx_get_chip_info,
- .set_snk_ctrl = tcpci_tcpm_set_snk_ctrl,
- .set_src_ctrl = tcpci_tcpm_set_src_ctrl,
+ .get_chip_info = ps8xxx_get_chip_info,
+ .set_snk_ctrl = tcpci_tcpm_set_snk_ctrl,
+ .set_src_ctrl = tcpci_tcpm_set_src_ctrl,
#ifdef CONFIG_USB_PD_TCPC_LOW_POWER
- .enter_low_power_mode = ps8xxx_enter_low_power_mode,
+ .enter_low_power_mode = ps8xxx_enter_low_power_mode,
#endif
- .set_bist_test_mode = tcpci_set_bist_test_mode,
+ .set_bist_test_mode = tcpci_set_bist_test_mode,
#if defined(CONFIG_USB_PD_FRS) && defined(CONFIG_USB_PD_TCPM_PS8815)
- .set_frs_enable = ps8815_tcpc_fast_role_swap_enable,
+ .set_frs_enable = ps8815_tcpc_fast_role_swap_enable,
#endif
};
@@ -1049,11 +1034,11 @@ static int ps8xxx_mux_set(const struct usb_mux *me, mux_state_t mux_state,
* setting mux breaks SuperSpeed connection.
*/
if (mux_state != USB_PD_MUX_NONE)
- RETURN_ERROR(mux_write(me, TCPC_REG_ROLE_CTRL,
- TCPC_REG_ROLE_CTRL_SET(TYPEC_NO_DRP,
- TYPEC_RP_USB,
- TYPEC_CC_RD,
- TYPEC_CC_RD)));
+ RETURN_ERROR(
+ mux_write(me, TCPC_REG_ROLE_CTRL,
+ TCPC_REG_ROLE_CTRL_SET(
+ TYPEC_NO_DRP, TYPEC_RP_USB,
+ TYPEC_CC_RD, TYPEC_CC_RD)));
}
return tcpci_tcpm_mux_set(me, mux_state, ack_required);