diff options
| author | Denis Brockus <dbrockus@chromium.org> | 2019-11-21 07:30:54 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-11-25 22:17:24 +0000 |
| commit | f9fd94f64d3294c2005048164361e3697d63a7bb (patch) | |
| tree | d408036789da808cc6be0d2b4b08ad9e8f6c6970 /baseboard | |
| parent | a621ea9f352a7fdd5fa41982bfc4c13f1e351f3c (diff) | |
| download | chrome-ec-f9fd94f64d3294c2005048164361e3697d63a7bb.tar.gz | |
usbc: make BB virtual mux retimer compatible with non-virtual
Changed the driver interface for BB virtual mux retimer to
stop using global functions and use the usb_retimers array
instead.
BUG=none
BRANCH=none
TEST=make buildall -j
Change-Id: I56befaca1720eb2f4e0599a983629b4df45dc76b
Signed-off-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1928121
Reviewed-by: Edward Hill <ecgh@chromium.org>
Commit-Queue: Edward Hill <ecgh@chromium.org>
Diffstat (limited to 'baseboard')
| -rw-r--r-- | baseboard/intelrvp/retimer.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/baseboard/intelrvp/retimer.c b/baseboard/intelrvp/retimer.c index 33ada53254..2759e13dde 100644 --- a/baseboard/intelrvp/retimer.c +++ b/baseboard/intelrvp/retimer.c @@ -11,25 +11,25 @@ /* USB Retimers configuration */ #ifdef CONFIG_USBC_RETIMER_INTEL_BB -struct bb_retimer bb_retimers[CONFIG_USB_PD_PORT_MAX_COUNT] = { +struct usb_retimer usb_retimers[CONFIG_USB_PD_PORT_MAX_COUNT] = { [TYPE_C_PORT_0] = { + .driver = &bb_usb_retimer, .i2c_port = I2C_PORT0_BB_RETIMER, - .i2c_addr = I2C_PORT0_BB_RETIMER_ADDR, - .shared_nvm = USB_PORT0_BB_RETIMER_SHARED_NVM, + .i2c_addr_flags = I2C_PORT0_BB_RETIMER_ADDR, .usb_ls_en_gpio = GPIO_USB_C0_LS_EN, .retimer_rst_gpio = GPIO_USB_C0_RETIMER_RST, .force_power_gpio = GPIO_USB_C0_RETIMER_FORCE_PWR, }, #ifdef HAS_TASK_PD_C1 [TYPE_C_PORT_1] = { + .driver = &bb_usb_retimer, .i2c_port = I2C_PORT1_BB_RETIMER, - .i2c_addr = I2C_PORT1_BB_RETIMER_ADDR, - .shared_nvm = USB_PORT1_BB_RETIMER_SHARED_NVM, + .i2c_addr_flags = I2C_PORT1_BB_RETIMER_ADDR, .usb_ls_en_gpio = GPIO_USB_C1_LS_EN, .retimer_rst_gpio = GPIO_USB_C1_RETIMER_RST, .force_power_gpio = GPIO_USB_C1_RETIMER_FORCE_PWR, }, #endif /* HAS_TASK_PD_C1 */ }; -BUILD_ASSERT(ARRAY_SIZE(bb_retimers) == CONFIG_USB_PD_PORT_MAX_COUNT); +BUILD_ASSERT(ARRAY_SIZE(usb_retimers) == CONFIG_USB_PD_PORT_MAX_COUNT); #endif /* CONFIG_USBC_RETIMER_INTEL_BB */ |