summaryrefslogtreecommitdiff
path: root/baseboard/octopus
diff options
context:
space:
mode:
authorJames_Chao <james_chao@asus.corp-partner.google.com>2018-11-20 19:49:34 +0800
committerchrome-bot <chrome-bot@chromium.org>2018-12-03 16:41:01 -0800
commit1585c6fc50ddb8e070445c32d083c15d138536a1 (patch)
tree3762c8300a680c4ce39ae3bee05f5f05cf739429 /baseboard/octopus
parentf556c986d1bf6688adceaaeeb18a272a5231b7ec (diff)
downloadchrome-ec-1585c6fc50ddb8e070445c32d083c15d138536a1.tar.gz
Ampton: change the port0 mux to PS8751
Due to the DP measurement eye-diagram and pre-emphasize fail, we change the mux to PS8751 on the type-c port in mainboard. BUG=b:118728290,b:119840612 BRANCH=octopus TEST=FAFT pass and check the mux function working on EVT. Change-Id: I1817686f09f6aa9a557907b279ab61c889335d9e Signed-off-by: James_Chao <james_chao@asus.corp-partner.google.com> Reviewed-on: https://chromium-review.googlesource.com/1343642 Commit-Ready: James Chao <james_chao@asus.corp-partner.google.com> Tested-by: James Chao <james_chao@asus.corp-partner.google.com> Reviewed-by: Jett Rink <jettrink@chromium.org> Reviewed-by: Diana Z <dzigterman@chromium.org>
Diffstat (limited to 'baseboard/octopus')
-rw-r--r--baseboard/octopus/baseboard.c3
-rw-r--r--baseboard/octopus/variant_usbc_ec_tcpcs.c5
-rw-r--r--baseboard/octopus/variant_usbc_standalone_tcpcs.c4
3 files changed, 7 insertions, 5 deletions
diff --git a/baseboard/octopus/baseboard.c b/baseboard/octopus/baseboard.c
index 7dc7c47e07..30a450e991 100644
--- a/baseboard/octopus/baseboard.c
+++ b/baseboard/octopus/baseboard.c
@@ -212,7 +212,8 @@ void baseboard_tcpc_init(void)
mux->hpd_update(port, 0, 0);
}
}
-DECLARE_HOOK(HOOK_INIT, baseboard_tcpc_init, HOOK_PRIO_INIT_I2C + 1);
+/* Called after the cbi_init (via +2) */
+DECLARE_HOOK(HOOK_INIT, baseboard_tcpc_init, HOOK_PRIO_INIT_I2C + 2);
int board_set_active_charge_port(int port)
{
diff --git a/baseboard/octopus/variant_usbc_ec_tcpcs.c b/baseboard/octopus/variant_usbc_ec_tcpcs.c
index ead689bf80..cb137ee06f 100644
--- a/baseboard/octopus/variant_usbc_ec_tcpcs.c
+++ b/baseboard/octopus/variant_usbc_ec_tcpcs.c
@@ -60,6 +60,7 @@ static void board_it83xx_hpd_status(int port, int hpd_lvl, int hpd_irq)
}
}
+/* This configuration might be override by each boards */
struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = {
[USB_PD_PORT_ITE_0] = {
/* Driver uses I2C_PORT_USB_MUX as I2C port */
@@ -102,8 +103,8 @@ void variant_tcpc_init(void)
gpio_enable_interrupt(GPIO_USB_C0_PD_INT_ODL);
gpio_enable_interrupt(GPIO_USB_C1_PD_INT_ODL);
}
-/* Called after the baseboard_tcpc_init (via +2) */
-DECLARE_HOOK(HOOK_INIT, variant_tcpc_init, HOOK_PRIO_INIT_I2C + 2);
+/* Called after the baseboard_tcpc_init (via +3) */
+DECLARE_HOOK(HOOK_INIT, variant_tcpc_init, HOOK_PRIO_INIT_I2C + 3);
uint16_t tcpc_get_alert_status(void)
{
diff --git a/baseboard/octopus/variant_usbc_standalone_tcpcs.c b/baseboard/octopus/variant_usbc_standalone_tcpcs.c
index ec2c65bd23..09cac5f575 100644
--- a/baseboard/octopus/variant_usbc_standalone_tcpcs.c
+++ b/baseboard/octopus/variant_usbc_standalone_tcpcs.c
@@ -116,8 +116,8 @@ void variant_tcpc_init(void)
gpio_enable_interrupt(GPIO_USB_C0_MUX_INT_ODL);
gpio_enable_interrupt(GPIO_USB_C1_MUX_INT_ODL);
}
-/* Called after the baseboard_tcpc_init (via +2) */
-DECLARE_HOOK(HOOK_INIT, variant_tcpc_init, HOOK_PRIO_INIT_I2C + 2);
+/* Called after the baseboard_tcpc_init (via +3) */
+DECLARE_HOOK(HOOK_INIT, variant_tcpc_init, HOOK_PRIO_INIT_I2C + 3);
uint16_t tcpc_get_alert_status(void)
{