diff options
Diffstat (limited to 'board/ampton/board.c')
| -rw-r--r-- | board/ampton/board.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/board/ampton/board.c b/board/ampton/board.c index df151c8918..4f1f0880df 100644 --- a/board/ampton/board.c +++ b/board/ampton/board.c @@ -66,13 +66,14 @@ int ppc_get_alert_status(int port) #define USB_PD_PORT_ITE_0 0 #define USB_PD_PORT_ITE_1 1 -static int tune_mux(int port); +static int tune_mux(const struct usb_mux *me); -struct usb_mux ampton_usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux ampton_usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { [USB_PD_PORT_ITE_0] = { /* Use PS8751 as mux only */ - .port_addr = MUX_PORT_AND_ADDR( - I2C_PORT_USBC0, PS8751_I2C_ADDR1_FLAGS), + .usb_port = USB_PD_PORT_ITE_0, + .i2c_port = I2C_PORT_USBC0, + .i2c_addr_flags = PS8751_I2C_ADDR1_FLAGS, .flags = USB_MUX_FLAG_NOT_TCPC, .driver = &ps8xxx_usb_mux_driver, .hpd_update = &ps8xxx_tcpc_update_hpd_status, @@ -80,8 +81,9 @@ struct usb_mux ampton_usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { }, [USB_PD_PORT_ITE_1] = { /* Use PS8751 as mux only */ - .port_addr = MUX_PORT_AND_ADDR( - I2C_PORT_USBC1, PS8751_I2C_ADDR1_FLAGS), + .usb_port = USB_PD_PORT_ITE_1, + .i2c_port = I2C_PORT_USBC1, + .i2c_addr_flags = PS8751_I2C_ADDR1_FLAGS, .flags = USB_MUX_FLAG_NOT_TCPC, .driver = &ps8xxx_usb_mux_driver, .hpd_update = &ps8xxx_tcpc_update_hpd_status, @@ -92,12 +94,12 @@ struct usb_mux ampton_usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { /* Some external monitors can't display content normally (eg. ViewSonic VX2880). * We need to turn the mux for monitors to function normally. */ -static int tune_mux(int port) +static int tune_mux(const struct usb_mux *me) { /* Auto EQ disabled, compensate for channel lost up to 3.6dB */ - mux_write(port, PS8XXX_REG_MUX_DP_EQ_CONFIGURATION, 0x98); + mux_write(me, PS8XXX_REG_MUX_DP_EQ_CONFIGURATION, 0x98); /* DP output swing adjustment +15% */ - mux_write(port, PS8XXX_REG_MUX_DP_OUTPUT_CONFIGURATION, 0xc0); + mux_write(me, PS8XXX_REG_MUX_DP_OUTPUT_CONFIGURATION, 0xc0); return EC_SUCCESS; } |