diff options
7 files changed, 100 insertions, 86 deletions
diff --git a/src/mainboard/system76/adl/variants/darp8/overridetree.cb b/src/mainboard/system76/adl/variants/darp8/overridetree.cb index 1feac2b916..05d6a4504c 100644 --- a/src/mainboard/system76/adl/variants/darp8/overridetree.cb +++ b/src/mainboard/system76/adl/variants/darp8/overridetree.cb @@ -39,18 +39,20 @@ chip soc/intel/alderlake end end device ref xhci on - # USB2 - register "usb2_ports[0]" = "USB2_PORT_MID(OC_SKIP)" # Type-A Motherboard - register "usb2_ports[1]" = "USB2_PORT_MID(OC_SKIP)" # Type-A Multi Board - register "usb2_ports[2]" = "USB2_PORT_TYPE_C(OC_SKIP)" # J_TYPEC1 (USB 3.2 Gen 2) - register "usb2_ports[4]" = "USB2_PORT_MID(OC_SKIP)" # Fingerprint - register "usb2_ports[5]" = "USB2_PORT_TYPE_C(OC_SKIP)" # J_TYPEC2 (Thunderbolt) - register "usb2_ports[6]" = "USB2_PORT_MID(OC_SKIP)" # Camera - register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" # Bluetooth - # USB3 - register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC_SKIP)" # Type-A Motherboard - register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC_SKIP)" # J_TYPEC1 CH1 - register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)" # J_TYPEC1 CH2 + register "usb2_ports" = "{ + [0] = USB2_PORT_MID(OC_SKIP), /* Type-A Motherboard */ + [1] = USB2_PORT_MID(OC_SKIP), /* Type-A Multi Board */ + [2] = USB2_PORT_TYPE_C(OC_SKIP), /* J_TYPEC1 (USB 3.2 Gen 2) */ + [4] = USB2_PORT_MID(OC_SKIP), /* Fingerprint */ + [5] = USB2_PORT_TYPE_C(OC_SKIP), /* J_TYPEC2 (Thunderbolt) */ + [6] = USB2_PORT_MID(OC_SKIP), /* Camera */ + [9] = USB2_PORT_MID(OC_SKIP), /* Bluetooth */ + }" + register "usb3_ports" = "{ + [0] = USB3_PORT_DEFAULT(OC_SKIP), /* Type-A Motherboard */ + [1] = USB3_PORT_DEFAULT(OC_SKIP), /* J_TYPEC1 CH1 */ + [2] = USB3_PORT_DEFAULT(OC_SKIP), /* J_TYPEC1 CH2 */ + }" # ACPI chip drivers/usb/acpi device ref xhci_root_hub on diff --git a/src/mainboard/system76/adl/variants/galp6/overridetree.cb b/src/mainboard/system76/adl/variants/galp6/overridetree.cb index dc5d593cae..a0a0ad26cf 100644 --- a/src/mainboard/system76/adl/variants/galp6/overridetree.cb +++ b/src/mainboard/system76/adl/variants/galp6/overridetree.cb @@ -46,18 +46,20 @@ chip soc/intel/alderlake end end device ref xhci on - # USB2 - register "usb2_ports[0]" = "USB2_PORT_MID(OC_SKIP)" # J_USB3_2 - register "usb2_ports[1]" = "USB2_PORT_TYPE_C(OC_SKIP)" # J_TYPEC1 - register "usb2_ports[2]" = "USB2_PORT_MID(OC_SKIP)" # J_USB3_1 - register "usb2_ports[4]" = "USB2_PORT_MID(OC_SKIP)" # Fingerprint - register "usb2_ports[5]" = "USB2_PORT_TYPE_C(OC_SKIP)" # J_TYPEC2 - register "usb2_ports[6]" = "USB2_PORT_MID(OC_SKIP)" # Camera - register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" # Bluetooth - # USB3 - register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC_SKIP)" # Type-A - register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)" # Type-A - register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC_SKIP)" # Type-C + register "usb2_ports" = "{ + [0] = USB2_PORT_MID(OC_SKIP), /* J_USB3_2 */ + [1] = USB2_PORT_TYPE_C(OC_SKIP), /* J_TYPEC1 */ + [2] = USB2_PORT_MID(OC_SKIP), /* J_USB3_1 */ + [4] = USB2_PORT_MID(OC_SKIP), /* Fingerprint */ + [5] = USB2_PORT_TYPE_C(OC_SKIP), /* J_TYPEC2 */ + [6] = USB2_PORT_MID(OC_SKIP), /* Camera */ + [9] = USB2_PORT_MID(OC_SKIP), /* Bluetooth */ + }" + register "usb3_ports" = "{ + [0] = USB3_PORT_DEFAULT(OC_SKIP), /* Type-A */ + [2] = USB3_PORT_DEFAULT(OC_SKIP), /* Type-A */ + [3] = USB3_PORT_DEFAULT(OC_SKIP), /* Type-C */ + }" # ACPI chip drivers/usb/acpi device ref xhci_root_hub on diff --git a/src/mainboard/system76/adl/variants/gaze17-3050/overridetree.cb b/src/mainboard/system76/adl/variants/gaze17-3050/overridetree.cb index 6624227537..880bb27514 100644 --- a/src/mainboard/system76/adl/variants/gaze17-3050/overridetree.cb +++ b/src/mainboard/system76/adl/variants/gaze17-3050/overridetree.cb @@ -76,19 +76,21 @@ chip soc/intel/alderlake end end device ref xhci on - # USB2 - register "usb2_ports[2]" = "USB2_PORT_TYPE_C(OC_SKIP)" # J_TYPEC1 - register "usb2_ports[4]" = "USB2_PORT_MID(OC_SKIP)" # USB 3.2 Type-A audio board - register "usb2_ports[5]" = "USB2_PORT_TYPE_C(OC_SKIP)" # J_TYPEC2 - register "usb2_ports[6]" = "USB2_PORT_MID(OC_SKIP)" # Fingerprint - register "usb2_ports[7]" = "USB2_PORT_MID(OC_SKIP)" # Camera - register "usb2_ports[8]" = "USB2_PORT_MID(OC_SKIP)" # USB 2.0 Type-A audio board - register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" # Bluetooth - # USB3 - register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC_SKIP)" # USB 3.2 Type-A audio board - register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC_SKIP)" # J_TYPEC2 - register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)" # J_TYPEC1 - register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC_SKIP)" # J_TYPEC1 + register "usb2_ports" = "{ + [2] = USB2_PORT_TYPE_C(OC_SKIP), /* J_TYPEC1 */ + [4] = USB2_PORT_MID(OC_SKIP), /* USB 3.2 Type-A audio board */ + [5] = USB2_PORT_TYPE_C(OC_SKIP), /* J_TYPEC2 */ + [6] = USB2_PORT_MID(OC_SKIP), /* Fingerprint */ + [7] = USB2_PORT_MID(OC_SKIP), /* Camera */ + [8] = USB2_PORT_MID(OC_SKIP), /* USB 2.0 Type-A audio board */ + [9] = USB2_PORT_MID(OC_SKIP), /* Bluetooth */ + }" + register "usb3_ports" = "{ + [0] = USB3_PORT_DEFAULT(OC_SKIP), /* USB 3.2 Type-A audio board */ + [1] = USB3_PORT_DEFAULT(OC_SKIP), /* J_TYPEC2 */ + [2] = USB3_PORT_DEFAULT(OC_SKIP), /* J_TYPEC1 */ + [3] = USB3_PORT_DEFAULT(OC_SKIP), /* J_TYPEC1 */ + }" end device ref pcie_rp5 on # PCIe RP#5 x4, Clock 1 (SSD) diff --git a/src/mainboard/system76/adl/variants/gaze17-3060-b/overridetree.cb b/src/mainboard/system76/adl/variants/gaze17-3060-b/overridetree.cb index 213fa64b3e..90bd5c18a0 100644 --- a/src/mainboard/system76/adl/variants/gaze17-3060-b/overridetree.cb +++ b/src/mainboard/system76/adl/variants/gaze17-3060-b/overridetree.cb @@ -83,18 +83,20 @@ chip soc/intel/alderlake end device ref tcss_dma0 on end device ref xhci on - # USB2 - register "usb2_ports[0]" = "USB2_PORT_MID(OC_SKIP)" # USB 3.2 Type-A audio board - register "usb2_ports[2]" = "USB2_PORT_TYPE_C(OC_SKIP)" # USB 3.2 Type-C - register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" # USB 2.0 Type-A audio board - register "usb2_ports[6]" = "USB2_PORT_MID(OC_SKIP)" # Fingerprint - register "usb2_ports[7]" = "USB2_PORT_MID(OC_SKIP)" # Camera - register "usb2_ports[8]" = "USB2_PORT_TYPE_C(OC_SKIP)" # Thunderbolt Type-C - register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" # Bluetooth - # USB3 - register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC_SKIP)" # USB 3.2 Type-A audio board - register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)" # USB 3.2 Type-C side A - register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC_SKIP)" # USB 3.2 Type-C side B + register "usb2_ports" = "{ + [0] = USB2_PORT_MID(OC_SKIP), /* USB 3.2 Type-A audio board */ + [2] = USB2_PORT_TYPE_C(OC_SKIP), /* USB 3.2 Type-C */ + [5] = USB2_PORT_MID(OC_SKIP), /* USB 2.0 Type-A audio board */ + [6] = USB2_PORT_MID(OC_SKIP), /* Fingerprint */ + [7] = USB2_PORT_MID(OC_SKIP), /* Camera */ + [8] = USB2_PORT_TYPE_C(OC_SKIP), /* Thunderbolt Type-C */ + [9] = USB2_PORT_MID(OC_SKIP), /* Bluetooth */ + }" + register "usb3_ports" = "{ + [0] = USB3_PORT_DEFAULT(OC_SKIP), /* USB 3.2 Type-A audio board */ + [2] = USB3_PORT_DEFAULT(OC_SKIP), /* USB 3.2 Type-C side A */ + [3] = USB3_PORT_DEFAULT(OC_SKIP), /* USB 3.2 Type-C side B */ + }" end device ref pcie_rp5 on # PCIe root port #5 x1, Clock 2 (WLAN) diff --git a/src/mainboard/system76/adl/variants/lemp11/overridetree.cb b/src/mainboard/system76/adl/variants/lemp11/overridetree.cb index 34e8041269..d31e6a4255 100644 --- a/src/mainboard/system76/adl/variants/lemp11/overridetree.cb +++ b/src/mainboard/system76/adl/variants/lemp11/overridetree.cb @@ -39,17 +39,19 @@ chip soc/intel/alderlake end end device ref xhci on - # USB2 - register "usb2_ports[0]" = "USB2_PORT_MID(OC_SKIP)" # Type-A Left - register "usb2_ports[1]" = "USB2_PORT_MID(OC_SKIP)" # Type-A Right - register "usb2_ports[2]" = "USB2_PORT_TYPE_C(OC_SKIP)" # J_TYPEC1 - register "usb2_ports[3]" = "USB2_PORT_MID(OC_SKIP)" # 3G/LTE - register "usb2_ports[6]" = "USB2_PORT_MID(OC_SKIP)" # Camera - register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" # Bluetooth - # USB3 - register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC_SKIP)" # Type-A Left - register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC_SKIP)" # Type-A Right - register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC_SKIP)" # 3G/LTE + register "usb2_ports" = "{ + [0] = USB2_PORT_MID(OC_SKIP), /* Type-A Left */ + [1] = USB2_PORT_MID(OC_SKIP), /* Type-A Right */ + [2] = USB2_PORT_TYPE_C(OC_SKIP), /* J_TYPEC1 */ + [3] = USB2_PORT_MID(OC_SKIP), /* 3G/LTE */ + [6] = USB2_PORT_MID(OC_SKIP), /* Camera */ + [9] = USB2_PORT_MID(OC_SKIP), /* Bluetooth */ + }" + register "usb3_ports" = "{ + [0] = USB3_PORT_DEFAULT(OC_SKIP), /* Type-A Left */ + [1] = USB3_PORT_DEFAULT(OC_SKIP), /* Type-A Right */ + [3] = USB3_PORT_DEFAULT(OC_SKIP), /* 3G/LTE */ + }" # ACPI chip drivers/usb/acpi device ref xhci_root_hub on diff --git a/src/mainboard/system76/adl/variants/oryp10/overridetree.cb b/src/mainboard/system76/adl/variants/oryp10/overridetree.cb index b675cb4549..efebe7af91 100644 --- a/src/mainboard/system76/adl/variants/oryp10/overridetree.cb +++ b/src/mainboard/system76/adl/variants/oryp10/overridetree.cb @@ -64,19 +64,21 @@ chip soc/intel/alderlake end end device ref xhci on - # USB2 - register "usb2_ports[0]" = "USB2_PORT_TYPE_C(OC_SKIP)" # TYPEC1 (USB 3.2 Gen2) - register "usb2_ports[1]" = "USB2_PORT_MID(OC_SKIP)" # J_USB2 - register "usb2_ports[2]" = "USB2_PORT_MID(OC_SKIP)" # J_USB1 - register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" # Per-KB - register "usb2_ports[6]" = "USB2_PORT_MID(OC_SKIP)" # Fingerprint - register "usb2_ports[7]" = "USB2_PORT_MID(OC_SKIP)" # Camera - register "usb2_ports[8]" = "USB2_PORT_TYPE_C(OC_SKIP)" # TYPEC2 (Thunderbolt) - register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" # Bluetooth - # USB3 - register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC_SKIP)" # TYPEC1 (USB 3.2 Gen2) - register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC_SKIP)" # J_USB2 - register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)" # J_USB1 + register "usb2_ports" = "{ + [0] = USB2_PORT_TYPE_C(OC_SKIP), /* TYPEC1 (USB 3.2 Gen2) */ + [1] = USB2_PORT_MID(OC_SKIP), /* J_USB2 */ + [2] = USB2_PORT_MID(OC_SKIP), /* J_USB1 */ + [5] = USB2_PORT_MID(OC_SKIP), /* Per-KB */ + [6] = USB2_PORT_MID(OC_SKIP), /* Fingerprint */ + [7] = USB2_PORT_MID(OC_SKIP), /* Camera */ + [8] = USB2_PORT_TYPE_C(OC_SKIP), /* TYPEC2 (Thunderbolt) */ + [9] = USB2_PORT_MID(OC_SKIP), /* Bluetooth */ + }" + register "usb3_ports" = "{ + [0] = USB3_PORT_DEFAULT(OC_SKIP), /* TYPEC1 (USB 3.2 Gen2) */ + [1] = USB3_PORT_DEFAULT(OC_SKIP), /* J_USB2 */ + [2] = USB3_PORT_DEFAULT(OC_SKIP), /* J_USB1 */ + }" # ACPI chip drivers/usb/acpi device ref xhci_root_hub on diff --git a/src/mainboard/system76/adl/variants/oryp9/overridetree.cb b/src/mainboard/system76/adl/variants/oryp9/overridetree.cb index 13989cb2c0..2f79c9edeb 100644 --- a/src/mainboard/system76/adl/variants/oryp9/overridetree.cb +++ b/src/mainboard/system76/adl/variants/oryp9/overridetree.cb @@ -64,19 +64,21 @@ chip soc/intel/alderlake end end device ref xhci on - # USB2 - register "usb2_ports[0]" = "USB2_PORT_TYPE_C(OC_SKIP)" # TYPEC1 (USB 3.2 Gen2) - register "usb2_ports[1]" = "USB2_PORT_MID(OC_SKIP)" # J_USB2 - register "usb2_ports[2]" = "USB2_PORT_MID(OC_SKIP)" # J_USB1 - register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" # Per-KB - register "usb2_ports[6]" = "USB2_PORT_MID(OC_SKIP)" # Fingerprint - register "usb2_ports[7]" = "USB2_PORT_MID(OC_SKIP)" # Camera - register "usb2_ports[8]" = "USB2_PORT_TYPE_C(OC_SKIP)" # TYPEC2 (Thunderbolt) - register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" # Bluetooth - # USB3 - register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC_SKIP)" # TYPEC1 (USB 3.2 Gen2) - register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC_SKIP)" # J_USB2 - register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)" # J_USB1 + register "usb2_ports" = "{ + [0] = USB2_PORT_TYPE_C(OC_SKIP), /* TYPEC1 (USB 3.2 Gen2) */ + [1] = USB2_PORT_MID(OC_SKIP), /* J_USB2 */ + [2] = USB2_PORT_MID(OC_SKIP), /* J_USB1 */ + [5] = USB2_PORT_MID(OC_SKIP), /* Per-KB */ + [6] = USB2_PORT_MID(OC_SKIP), /* Fingerprint */ + [7] = USB2_PORT_MID(OC_SKIP), /* Camera */ + [8] = USB2_PORT_TYPE_C(OC_SKIP), /* TYPEC2 (Thunderbolt) */ + [9] = USB2_PORT_MID(OC_SKIP), /* Bluetooth */ + }" + register "usb3_ports" = "{ + [0] = USB3_PORT_DEFAULT(OC_SKIP), /* TYPEC1 (USB 3.2 Gen2) */ + [1] = USB3_PORT_DEFAULT(OC_SKIP), /* J_USB2 */ + [2] = USB3_PORT_DEFAULT(OC_SKIP), /* J_USB1 */ + }" # ACPI chip drivers/usb/acpi device ref xhci_root_hub on |