GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/google/rex/var/karis: Update USB settings 

BUG=b:294155897
TEST=emerge-rex coreboot

Change-Id: Ia4bd6fe02ffa62ed8aeffb188de5c4c4b64900ff
Signed-off-by: Tyler Wang <tyler.wang@quanta.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/77106
Reviewed-by: Kapil Porwal <kapilporwal@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Subrata Banik <subratabanik@google.com>
This commit is contained in:
Tyler Wang 2023-08-09 15:50:11 +08:00 committed by Matt DeVillier
parent af7df0fd32
commit e49d03395f
2 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mainboard/google/rex/variants/karis/gpio.c
View File

@ -203,8 +203,8 @@ static const struct pad_config gpio_table[] = {
PAD_CFG_GPO(GPP_E07, 1, DEEP), PAD_CFG_GPO(GPP_E07, 1, DEEP),
/* GPP_E08 : [] ==> SAR2_INT_L */ /* GPP_E08 : [] ==> SAR2_INT_L */
PAD_CFG_GPI_APIC_LOCK(GPP_E08, NONE, LEVEL, NONE, LOCK_CONFIG), PAD_CFG_GPI_APIC_LOCK(GPP_E08, NONE, LEVEL, NONE, LOCK_CONFIG),
/* GPP_E09 : No heuristic was found useful */ /* GPP_E09 : Not Connected */
PAD_CFG_NF_LOCK(GPP_E09, NONE, NF1, LOCK_CONFIG), PAD_NC(GPP_E09, NONE),
/* GPP_E10 : [] ==> SOC_FPMCU_INT_L */ /* GPP_E10 : [] ==> SOC_FPMCU_INT_L */
PAD_CFG_GPI_IRQ_WAKE_LOCK(GPP_E10, NONE, LEVEL, INVERT, LOCK_CONFIG), PAD_CFG_GPI_IRQ_WAKE_LOCK(GPP_E10, NONE, LEVEL, INVERT, LOCK_CONFIG),
/* GPP_E11 : [] ==> MEM_STRAP_0 */ /* GPP_E11 : [] ==> MEM_STRAP_0 */

34
src/mainboard/google/rex/variants/karis/overridetree.cb
View File

@ -51,17 +51,15 @@ end
chip soc/intel/meteorlake chip soc/intel/meteorlake
register "usb2_ports[0]" = "USB2_PORT_TYPE_C(OC_SKIP)" # USB2_C1 register "usb2_ports[0]" = "USB2_PORT_TYPE_C(OC_SKIP)" # USB2_C1
register "usb2_ports[1]" = "USB2_PORT_TYPE_C(OC0)" # USB2_C0 register "usb2_ports[1]" = "USB2_PORT_TYPE_C(OC_SKIP)" # USB2_C0
register "usb2_ports[4]" = "USB2_PORT_MID(OC_SKIP)" # M.2 WWAN register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" # USB Camera
register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" # M.2 Camera
register "usb2_ports[8]" = "USB2_PORT_MID(OC3)" # Type-A Port A0 register "usb2_ports[8]" = "USB2_PORT_MID(OC3)" # Type-A Port A0
register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" # M.2 Bluetooth register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" # M.2 Bluetooth
register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC3)" # USB3/2 Type A port A0 register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC3)" # USB3/2 Type A port A0
register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC_SKIP)" # USB3 port for WWAN
register "tcss_ports[0]" = "TCSS_PORT_DEFAULT(OC0)" register "tcss_ports[0]" = "TCSS_PORT_DEFAULT(OC_SKIP)" # USB3_C0
register "tcss_ports[2]" = "TCSS_PORT_DEFAULT(OC_SKIP)" register "tcss_ports[2]" = "TCSS_PORT_DEFAULT(OC_SKIP)" # USB3_C1
# Enable eDP in Port A # Enable eDP in Port A
register "ddi_port_A_config" = "1" register "ddi_port_A_config" = "1"
@ -156,7 +154,7 @@ chip soc/intel/meteorlake
# TCP2 (DP-3) for port C1 # TCP2 (DP-3) for port C1
register "device[4].name" = ""DD04"" register "device[4].name" = ""DD04""
register "device[4].use_pld" = "true" register "device[4].use_pld" = "true"
register "device[4].pld" = "ACPI_PLD_TYPE_C(RIGHT, LEFT, ACPI_PLD_GROUP(2, 1))" register "device[4].pld" = "ACPI_PLD_TYPE_C(LEFT, RIGHT, ACPI_PLD_GROUP(2, 1))"
# TCP3 (DP-4) unused # TCP3 (DP-4) unused
register "device[5].name" = ""DD05"" register "device[5].name" = ""DD05""
device generic 0 on end device generic 0 on end
@ -311,10 +309,10 @@ chip soc/intel/meteorlake
device ref tcss_usb3_port0 on end device ref tcss_usb3_port0 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-C Port C1 (DB)"" register "desc" = ""USB3 Type-C Port C1 (MLB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "use_custom_pld" = "true" register "use_custom_pld" = "true"
register "custom_pld" = "ACPI_PLD_TYPE_C(RIGHT, LEFT, ACPI_PLD_GROUP(2, 1))" register "custom_pld" = "ACPI_PLD_TYPE_C(LEFT, RIGHT, ACPI_PLD_GROUP(2, 1))"
device ref tcss_usb3_port2 on end device ref tcss_usb3_port2 on end
end end
end end
@ -338,10 +336,10 @@ chip soc/intel/meteorlake
chip drivers/usb/acpi chip drivers/usb/acpi
device ref xhci_root_hub on device ref xhci_root_hub on
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-C Port C1 (DB)"" register "desc" = ""USB2 Type-C Port C1 (MLB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "use_custom_pld" = "true" register "use_custom_pld" = "true"
register "custom_pld" = "ACPI_PLD_TYPE_C(RIGHT, LEFT, ACPI_PLD_GROUP(2, 1))" register "custom_pld" = "ACPI_PLD_TYPE_C(LEFT, RIGHT, ACPI_PLD_GROUP(2, 1))"
device ref usb2_port1 on end device ref usb2_port1 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
@ -351,13 +349,6 @@ chip soc/intel/meteorlake
register "custom_pld" = "ACPI_PLD_TYPE_C(LEFT, LEFT, ACPI_PLD_GROUP(1, 1))" register "custom_pld" = "ACPI_PLD_TYPE_C(LEFT, LEFT, ACPI_PLD_GROUP(1, 1))"
device ref usb2_port2 on end device ref usb2_port2 on end
end end
chip drivers/usb/acpi
register "desc" = ""USB2 WWAN""
register "type" = "UPC_TYPE_INTERNAL"
device ref usb2_port5 on
probe CELLULAR CELLULAR_USB
end
end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Camera"" register "desc" = ""USB2 Camera""
register "type" = "UPC_TYPE_INTERNAL" register "type" = "UPC_TYPE_INTERNAL"
@ -387,13 +378,6 @@ chip soc/intel/meteorlake
register "custom_pld" = "ACPI_PLD_TYPE_A(RIGHT, RIGHT, ACPI_PLD_GROUP(3, 1))" register "custom_pld" = "ACPI_PLD_TYPE_A(RIGHT, RIGHT, ACPI_PLD_GROUP(3, 1))"
device ref usb3_port1 on end device ref usb3_port1 on end
end end
chip drivers/usb/acpi
register "desc" = ""USB3 WWAN""
register "type" = "UPC_TYPE_INTERNAL"
device ref usb3_port2 on
probe CELLULAR CELLULAR_USB
end
end
end end
end end
end end