summaryrefslogtreecommitdiff
path: root/baseboard/volteer/baseboard.c
diff options
context:
space:
mode:
authorDenis Brockus <dbrockus@chromium.org>2020-01-13 13:12:45 -0700
committerCommit Bot <commit-bot@chromium.org>2020-01-16 00:57:29 +0000
commit0dbd7e342cdc20d6fc7324da9440f837e87d8cf8 (patch)
tree24c05da86f22208fd2cce91d4d228e5124167bac /baseboard/volteer/baseboard.c
parente45ef48d07fda7e449873de3161071774e57072c (diff)
downloadchrome-ec-0dbd7e342cdc20d6fc7324da9440f837e87d8cf8.tar.gz
retimer: framework cleanup for chip specific control config
combine the optional control variables into a union of structures to reduce the amount of space needed for a particular board type. BUG=b:147593165 BRANCH=none TEST=make buildall -j Change-Id: If02c4c8065f4570aba210c3e34b30bc0d5c7a852 Signed-off-by: Denis Brockus <dbrockus@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2001134 Reviewed-by: Jett Rink <jettrink@chromium.org> Reviewed-by: Edward Hill <ecgh@chromium.org>
Diffstat (limited to 'baseboard/volteer/baseboard.c')
-rw-r--r--baseboard/volteer/baseboard.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/baseboard/volteer/baseboard.c b/baseboard/volteer/baseboard.c
index 01fc6bbbcd..0a0b6e526f 100644
--- a/baseboard/volteer/baseboard.c
+++ b/baseboard/volteer/baseboard.c
@@ -382,20 +382,29 @@ struct usb_mux usb_muxes[] = {
};
BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT);
-struct usb_retimer usb_retimers[] = {
+const struct bb_usb_control bb_controls[] = {
[USBC_PORT_C0] = {
/* USB-C port 0 doesn't have a retimer */
},
[USBC_PORT_C1] = {
- .driver = &bb_usb_retimer,
- .i2c_port = I2C_PORT_USB_1_MIX,
- .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR,
.shared_nvm = false,
.usb_ls_en_gpio = GPIO_USB_C1_LS_EN,
.retimer_rst_gpio = GPIO_USB_C1_RT_RST_ODL,
.force_power_gpio = GPIO_USB_C1_RT_FORCE_PWR,
},
};
+BUILD_ASSERT(ARRAY_SIZE(bb_controls) == USBC_PORT_COUNT);
+
+struct usb_retimer usb_retimers[] = {
+ [USBC_PORT_C0] = {
+ /* USB-C port 0 doesn't have a retimer */
+ },
+ [USBC_PORT_C1] = {
+ .driver = &bb_usb_retimer,
+ .i2c_port = I2C_PORT_USB_1_MIX,
+ .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR,
+ },
+};
BUILD_ASSERT(ARRAY_SIZE(usb_retimers) == USBC_PORT_COUNT);
static void baseboard_tcpc_init(void)