mb/google/puff: Switch USB2 port1 and port3

Switch USB2 port1 and port3 for duffy and kaisa due to circuit change.

BUG=b:153682207, b:154451230, b:154445635
BRANCH=None
TEST=emerge-puff coreboot chromeos-bootimage
     boot on puff board

Change-Id: I9c0cbcbefd045085fb70cf4f41869ab9b98103c4
Signed-off-by: Tim Chen <tim-chen@quanta.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40301
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Kangheui Won <khwon@chromium.org>
This commit is contained in:
Tim Chen 2020-04-20 16:26:30 +08:00 committed by Edward O'Callaghan
parent 21a4053fde
commit b26f792d72
2 changed files with 18 additions and 18 deletions

View File

@ -22,7 +22,14 @@ chip soc/intel/cannonlake
# USB configuration # USB configuration
register "usb2_ports[0]" = "USB2_PORT_MID(OC2)" # Type-A Port 2 register "usb2_ports[0]" = "USB2_PORT_MID(OC2)" # Type-A Port 2
register "usb2_ports[1]" = "USB2_PORT_TYPE_C(OC_SKIP)" # Type-C Port register "usb2_ports[1]" = "{
.enable = 1,
.ocpin = OC1,
.tx_bias = USB2_BIAS_0MV,
.tx_emp_enable = USB2_PRE_EMP_ON,
.pre_emp_bias = USB2_BIAS_28P15MV,
.pre_emp_bit = USB2_HALF_BIT_PRE_EMP,
}" # Type-A Port 1
register "usb2_ports[2]" = "{ register "usb2_ports[2]" = "{
.enable = 1, .enable = 1,
.ocpin = OC3, .ocpin = OC3,
@ -31,14 +38,7 @@ chip soc/intel/cannonlake
.pre_emp_bias = USB2_BIAS_28P15MV, .pre_emp_bias = USB2_BIAS_28P15MV,
.pre_emp_bit = USB2_HALF_BIT_PRE_EMP, .pre_emp_bit = USB2_HALF_BIT_PRE_EMP,
}" # Type-A Port 3 }" # Type-A Port 3
register "usb2_ports[3]" = "{ register "usb2_ports[3]" = "USB2_PORT_TYPE_C(OC_SKIP)" # Type-C Port
.enable = 1,
.ocpin = OC1,
.tx_bias = USB2_BIAS_0MV,
.tx_emp_enable = USB2_PRE_EMP_ON,
.pre_emp_bias = USB2_BIAS_28P15MV,
.pre_emp_bit = USB2_HALF_BIT_PRE_EMP,
}" # Type-A Port 1
register "usb2_ports[4]" = "{ register "usb2_ports[4]" = "{
.enable = 1, .enable = 1,
.ocpin = OC_SKIP, .ocpin = OC_SKIP,

View File

@ -22,7 +22,14 @@ chip soc/intel/cannonlake
# USB configuration # USB configuration
register "usb2_ports[0]" = "USB2_PORT_MID(OC2)" # Type-A Port 2 register "usb2_ports[0]" = "USB2_PORT_MID(OC2)" # Type-A Port 2
register "usb2_ports[1]" = "USB2_PORT_TYPE_C(OC_SKIP)" # Type-C Port register "usb2_ports[1]" = "{
.enable = 1,
.ocpin = OC1,
.tx_bias = USB2_BIAS_0MV,
.tx_emp_enable = USB2_PRE_EMP_ON,
.pre_emp_bias = USB2_BIAS_28P15MV,
.pre_emp_bit = USB2_HALF_BIT_PRE_EMP,
}" # Type-A Port 1
register "usb2_ports[2]" = "{ register "usb2_ports[2]" = "{
.enable = 1, .enable = 1,
.ocpin = OC3, .ocpin = OC3,
@ -31,14 +38,7 @@ chip soc/intel/cannonlake
.pre_emp_bias = USB2_BIAS_28P15MV, .pre_emp_bias = USB2_BIAS_28P15MV,
.pre_emp_bit = USB2_HALF_BIT_PRE_EMP, .pre_emp_bit = USB2_HALF_BIT_PRE_EMP,
}" # Type-A Port 3 }" # Type-A Port 3
register "usb2_ports[3]" = "{ register "usb2_ports[3]" = "USB2_PORT_TYPE_C(OC_SKIP)" # Type-C Port
.enable = 1,
.ocpin = OC1,
.tx_bias = USB2_BIAS_0MV,
.tx_emp_enable = USB2_PRE_EMP_ON,
.pre_emp_bias = USB2_BIAS_28P15MV,
.pre_emp_bit = USB2_HALF_BIT_PRE_EMP,
}" # Type-A Port 1
register "usb2_ports[4]" = "{ register "usb2_ports[4]" = "{
.enable = 1, .enable = 1,
.ocpin = OC_SKIP, .ocpin = OC_SKIP,