diff options
Diffstat (limited to 'baseboard/intelrvp')
| -rw-r--r-- | baseboard/intelrvp/bc12.c | 4 | ||||
| -rw-r--r-- | baseboard/intelrvp/chg_usb_pd.c | 4 | ||||
| -rw-r--r-- | baseboard/intelrvp/ite_ec.c | 4 | ||||
| -rw-r--r-- | baseboard/intelrvp/retimer.c | 4 | ||||
| -rw-r--r-- | baseboard/intelrvp/usb_mux.c | 4 | ||||
| -rw-r--r-- | baseboard/intelrvp/usb_pd_policy.c | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/baseboard/intelrvp/bc12.c b/baseboard/intelrvp/bc12.c index 4f1d1808cc..5a5807a325 100644 --- a/baseboard/intelrvp/bc12.c +++ b/baseboard/intelrvp/bc12.c @@ -10,7 +10,7 @@ /* BC1.2 chip Configuration */ #ifdef CONFIG_BC12_DETECT_MAX14637 -const struct max14637_config_t max14637_config[CONFIG_USB_PD_PORT_COUNT] = { +const struct max14637_config_t max14637_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { [TYPE_C_PORT_0] = { .chip_enable_pin = GPIO_USB_C0_BC12_VBUS_ON_ODL, .chg_det_pin = GPIO_USB_C0_BC12_CHG_DET_L, @@ -24,5 +24,5 @@ const struct max14637_config_t max14637_config[CONFIG_USB_PD_PORT_COUNT] = { }, #endif /* HAS_TASK_PD_C1 */ }; -BUILD_ASSERT(ARRAY_SIZE(max14637_config) == CONFIG_USB_PD_PORT_COUNT); +BUILD_ASSERT(ARRAY_SIZE(max14637_config) == CONFIG_USB_PD_PORT_MAX_COUNT); #endif /* CONFIG_BC12_DETECT_MAX14637 */ diff --git a/baseboard/intelrvp/chg_usb_pd.c b/baseboard/intelrvp/chg_usb_pd.c index 86360caeae..7c8834806a 100644 --- a/baseboard/intelrvp/chg_usb_pd.c +++ b/baseboard/intelrvp/chg_usb_pd.c @@ -93,7 +93,7 @@ void board_tcpc_init(void) board_reset_pd_mcu(); /* Enable TCPCx interrupt */ - for (i = 0; i < CONFIG_USB_PD_PORT_COUNT; i++) + for (i = 0; i < CONFIG_USB_PD_PORT_MAX_COUNT; i++) gpio_enable_interrupt(tcpc_gpios[i].vbus.pin); } DECLARE_HOOK(HOOK_INIT, board_tcpc_init, HOOK_PRIO_INIT_I2C + 1); @@ -170,7 +170,7 @@ int board_set_active_charge_port(int port) } /* Make sure non-charging ports are disabled */ - for (i = 0; i < CONFIG_USB_PD_PORT_COUNT; i++) { + for (i = 0; i < CONFIG_USB_PD_PORT_MAX_COUNT; i++) { if (i == port) continue; diff --git a/baseboard/intelrvp/ite_ec.c b/baseboard/intelrvp/ite_ec.c index b5a3547269..2faa17ad08 100644 --- a/baseboard/intelrvp/ite_ec.c +++ b/baseboard/intelrvp/ite_ec.c @@ -14,7 +14,7 @@ #include "usb_pd_tcpm.h" /* USB-C TPCP Configuration */ -const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { +const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { [TYPE_C_PORT_0] = { .bus_type = EC_BUS_TYPE_EMBEDDED, /* TCPC is embedded within EC so no i2c config needed */ @@ -34,7 +34,7 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { }, #endif /* HAS_TASK_PD_C1 */ }; -BUILD_ASSERT(ARRAY_SIZE(tcpc_config) == CONFIG_USB_PD_PORT_COUNT); +BUILD_ASSERT(ARRAY_SIZE(tcpc_config) == CONFIG_USB_PD_PORT_MAX_COUNT); /* Reset PD MCU */ void board_reset_pd_mcu(void) diff --git a/baseboard/intelrvp/retimer.c b/baseboard/intelrvp/retimer.c index 54c350017e..4ab6785d6f 100644 --- a/baseboard/intelrvp/retimer.c +++ b/baseboard/intelrvp/retimer.c @@ -11,7 +11,7 @@ /* USB Retimers configuration */ #ifdef CONFIG_USB_PD_RETIMER_INTEL_BB -struct bb_retimer bb_retimers[CONFIG_USB_PD_PORT_COUNT] = { +struct bb_retimer bb_retimers[CONFIG_USB_PD_PORT_MAX_COUNT] = { [TYPE_C_PORT_0] = { .i2c_port = I2C_PORT0_BB_RETIMER, .i2c_addr = I2C_PORT0_BB_RETIMER_ADDR, @@ -31,5 +31,5 @@ struct bb_retimer bb_retimers[CONFIG_USB_PD_PORT_COUNT] = { }, #endif /* HAS_TASK_PD_C1 */ }; -BUILD_ASSERT(ARRAY_SIZE(bb_retimers) == CONFIG_USB_PD_PORT_COUNT); +BUILD_ASSERT(ARRAY_SIZE(bb_retimers) == CONFIG_USB_PD_PORT_MAX_COUNT); #endif /* CONFIG_USB_PD_RETIMER_INTEL_BB */ diff --git a/baseboard/intelrvp/usb_mux.c b/baseboard/intelrvp/usb_mux.c index e4e45de188..2526fa5450 100644 --- a/baseboard/intelrvp/usb_mux.c +++ b/baseboard/intelrvp/usb_mux.c @@ -10,7 +10,7 @@ /* USB muxes Configuration */ #ifdef CONFIG_USB_MUX_VIRTUAL -struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = { +struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [TYPE_C_PORT_0] = { .driver = &virtual_usb_mux_driver, .hpd_update = &virtual_hpd_update, @@ -22,5 +22,5 @@ struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = { }, #endif /* HAS_TASK_PD_C1 */ }; -BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == CONFIG_USB_PD_PORT_COUNT); +BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == CONFIG_USB_PD_PORT_MAX_COUNT); #endif /* CONFIG_USB_MUX_VIRTUAL */ diff --git a/baseboard/intelrvp/usb_pd_policy.c b/baseboard/intelrvp/usb_pd_policy.c index dff7a89e46..db03f227b0 100644 --- a/baseboard/intelrvp/usb_pd_policy.c +++ b/baseboard/intelrvp/usb_pd_policy.c @@ -213,8 +213,8 @@ int pd_custom_vdm(int port, int cnt, uint32_t *payload, } #ifdef CONFIG_USB_PD_ALT_MODE_DFP -static int dp_flags[CONFIG_USB_PD_PORT_COUNT]; -static uint32_t dp_status[CONFIG_USB_PD_PORT_COUNT]; +static int dp_flags[CONFIG_USB_PD_PORT_MAX_COUNT]; +static uint32_t dp_status[CONFIG_USB_PD_PORT_MAX_COUNT]; static void svdm_safe_dp_mode(int port) { |