diff options
| author | Tyler Wang <tyler.wang@quanta.corp-partner.google.com> | 2023-08-09 15:50:11 +0800 |
|---|---|---|
| committer | Matt DeVillier <matt.devillier@amd.corp-partner.google.com> | 2023-08-17 15:02:12 +0000 |
| commit | e49d03395f019d5081f1ffa6007b720e6feee4a0 (patch) | |
| tree | e2b8e54450a889d76eda3c2fd8c0a294ea522f25 /src/mainboard/google | |
| parent | af7df0fd32a8220858871b465921cbe0745d8fbd (diff) | |
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>
Diffstat (limited to 'src/mainboard/google')
| -rw-r--r-- | src/mainboard/google/rex/variants/karis/gpio.c | 4 | ||||
| -rw-r--r-- | src/mainboard/google/rex/variants/karis/overridetree.cb | 34 |
2 files changed, 11 insertions, 27 deletions
diff --git a/src/mainboard/google/rex/variants/karis/gpio.c b/src/mainboard/google/rex/variants/karis/gpio.c index 8fdbc06b0f..0579bf8ba0 100644 --- a/src/mainboard/google/rex/variants/karis/gpio.c +++ b/src/mainboard/google/rex/variants/karis/gpio.c @@ -203,8 +203,8 @@ static const struct pad_config gpio_table[] = { PAD_CFG_GPO(GPP_E07, 1, DEEP), /* GPP_E08 : [] ==> SAR2_INT_L */ PAD_CFG_GPI_APIC_LOCK(GPP_E08, NONE, LEVEL, NONE, LOCK_CONFIG), - /* GPP_E09 : No heuristic was found useful */ - PAD_CFG_NF_LOCK(GPP_E09, NONE, NF1, LOCK_CONFIG), + /* GPP_E09 : Not Connected */ + PAD_NC(GPP_E09, NONE), /* GPP_E10 : [] ==> SOC_FPMCU_INT_L */ PAD_CFG_GPI_IRQ_WAKE_LOCK(GPP_E10, NONE, LEVEL, INVERT, LOCK_CONFIG), /* GPP_E11 : [] ==> MEM_STRAP_0 */ diff --git a/src/mainboard/google/rex/variants/karis/overridetree.cb b/src/mainboard/google/rex/variants/karis/overridetree.cb index 2ffdcb46a6..aa69d6f9f3 100644 --- a/src/mainboard/google/rex/variants/karis/overridetree.cb +++ b/src/mainboard/google/rex/variants/karis/overridetree.cb @@ -51,17 +51,15 @@ end chip soc/intel/meteorlake 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[4]" = "USB2_PORT_MID(OC_SKIP)" # M.2 WWAN - register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" # M.2 Camera + register "usb2_ports[1]" = "USB2_PORT_TYPE_C(OC_SKIP)" # USB2_C0 + register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" # USB Camera 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 "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[2]" = "TCSS_PORT_DEFAULT(OC_SKIP)" + register "tcss_ports[0]" = "TCSS_PORT_DEFAULT(OC_SKIP)" # USB3_C0 + register "tcss_ports[2]" = "TCSS_PORT_DEFAULT(OC_SKIP)" # USB3_C1 # Enable eDP in Port A register "ddi_port_A_config" = "1" @@ -156,7 +154,7 @@ chip soc/intel/meteorlake # TCP2 (DP-3) for port C1 register "device[4].name" = ""DD04"" 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 register "device[5].name" = ""DD05"" device generic 0 on end @@ -311,10 +309,10 @@ chip soc/intel/meteorlake device ref tcss_usb3_port0 on end end 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 "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 end end @@ -338,10 +336,10 @@ chip soc/intel/meteorlake chip drivers/usb/acpi device ref xhci_root_hub on 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 "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 end chip drivers/usb/acpi @@ -352,13 +350,6 @@ chip soc/intel/meteorlake device ref usb2_port2 on 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 register "desc" = ""USB2 Camera"" register "type" = "UPC_TYPE_INTERNAL" register "has_power_resource" = "1" @@ -387,13 +378,6 @@ chip soc/intel/meteorlake register "custom_pld" = "ACPI_PLD_TYPE_A(RIGHT, RIGHT, ACPI_PLD_GROUP(3, 1))" device ref usb3_port1 on 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 |