diff options
Diffstat (limited to 'board/flapjack')
-rw-r--r-- | board/flapjack/board.c | 4 | ||||
-rw-r--r-- | board/flapjack/board.h | 2 | ||||
-rw-r--r-- | board/flapjack/usb_pd_policy.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/board/flapjack/board.c b/board/flapjack/board.c index e84a5b947a..84d8e5016b 100644 --- a/board/flapjack/board.c +++ b/board/flapjack/board.c @@ -283,7 +283,7 @@ const struct spi_device_t spi_devices[] = { const unsigned int spi_devices_used = ARRAY_SIZE(spi_devices); /******************************************************************************/ -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] = { { .bus_type = EC_BUS_TYPE_I2C, .i2c_info = { @@ -293,7 +293,7 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { .drv = &mt6370_tcpm_drv}, }; -struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = { +struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { .driver = &virtual_usb_mux_driver, .hpd_update = &virtual_hpd_update, diff --git a/board/flapjack/board.h b/board/flapjack/board.h index 9d75d49012..af3f05ce9b 100644 --- a/board/flapjack/board.h +++ b/board/flapjack/board.h @@ -141,7 +141,7 @@ #define CONFIG_USB_PD_DUAL_ROLE #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE #define CONFIG_USB_PD_LOGGING -#define CONFIG_USB_PD_PORT_COUNT 1 +#define CONFIG_USB_PD_PORT_MAX_COUNT 1 #define CONFIG_USB_PD_TCPC_LOW_POWER #define CONFIG_USB_PD_TCPM_MT6370 #define CONFIG_USB_PD_TCPM_TCPCI diff --git a/board/flapjack/usb_pd_policy.c b/board/flapjack/usb_pd_policy.c index d4a5c0aa5c..b2c992b4e2 100644 --- a/board/flapjack/usb_pd_policy.c +++ b/board/flapjack/usb_pd_policy.c @@ -219,9 +219,9 @@ 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 int dp_flags[CONFIG_USB_PD_PORT_MAX_COUNT]; /* DP Status VDM as returned by UFP */ -static uint32_t dp_status[CONFIG_USB_PD_PORT_COUNT]; +static uint32_t dp_status[CONFIG_USB_PD_PORT_MAX_COUNT]; static void svdm_safe_dp_mode(int port) { @@ -280,7 +280,7 @@ static int svdm_dp_config(int port, uint32_t *payload) * timestamp of the next possible toggle to ensure the 2-ms spacing * between IRQ_HPD. */ -static uint64_t hpd_deadline[CONFIG_USB_PD_PORT_COUNT]; +static uint64_t hpd_deadline[CONFIG_USB_PD_PORT_MAX_COUNT]; static void svdm_dp_post_config(int port) { |