summaryrefslogtreecommitdiff
path: root/src/mainboard/system76/tgl-u
diff options
context:
space:
mode:
authorFelix Singer <felixsinger@posteo.net>2023-10-26 15:42:16 +0200
committerFelix Singer <service+coreboot-gerrit@felixsinger.de>2023-10-30 14:00:48 +0000
commitee1fd54aef8ec0aba9e3dc01111251e1ae6b9d12 (patch)
treec80d54121beec1c097e124ed7f3891edb71333ad /src/mainboard/system76/tgl-u
parentd163253ba047515e3317e9da38aa7cc5714a7f0c (diff)
mb/system76/{tgl,skl}/dt: Use comma separated list for arrays
In order to improve the readability of the settings, use a comma separated list to assign values to their indexes instead of repeating the option name for each index. Don't convert the settings for PCIe root ports as they should stay in the device scope of them. While on it, remove superfluous comments related to modified lines. Change-Id: I75aeb46ea3b4a7c0a41dce375735e7b42ed59587 Signed-off-by: Felix Singer <felixsinger@posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/78664 Reviewed-by: Tim Crawford <tcrawford@system76.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/system76/tgl-u')
-rw-r--r--src/mainboard/system76/tgl-u/variants/darp7/overridetree.cb26
-rw-r--r--src/mainboard/system76/tgl-u/variants/galp5/overridetree.cb28
-rw-r--r--src/mainboard/system76/tgl-u/variants/lemp10/overridetree.cb20
3 files changed, 40 insertions, 34 deletions
diff --git a/src/mainboard/system76/tgl-u/variants/darp7/overridetree.cb b/src/mainboard/system76/tgl-u/variants/darp7/overridetree.cb
index 8e0567713c..9a669ef7fd 100644
--- a/src/mainboard/system76/tgl-u/variants/darp7/overridetree.cb
+++ b/src/mainboard/system76/tgl-u/variants/darp7/overridetree.cb
@@ -51,18 +51,20 @@ chip soc/intel/tigerlake
end
device ref south_xhci on
- # USB2
- register "usb2_ports[0]" = "USB2_PORT_MID(OC_SKIP)" # UJ_USB1
- 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[1]" = "USB3_PORT_DEFAULT(OC_SKIP)" # J_TYPEC1 CH0
- register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)" # J_USB3_1
- register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC_SKIP)" # J_TYPEC1 CH1
+ register "usb2_ports" = "{
+ [0] = USB2_PORT_MID(OC_SKIP), /* UJ_USB1 */
+ [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" = "{
+ [1] = USB3_PORT_DEFAULT(OC_SKIP), /* J_TYPEC1 CH0 */
+ [2] = USB3_PORT_DEFAULT(OC_SKIP), /* J_USB3_1 */
+ [3] = USB3_PORT_DEFAULT(OC_SKIP), /* J_TYPEC1 CH1 */
+ }"
# ACPI
chip drivers/usb/acpi
diff --git a/src/mainboard/system76/tgl-u/variants/galp5/overridetree.cb b/src/mainboard/system76/tgl-u/variants/galp5/overridetree.cb
index 1b4249c3f7..7c3475e466 100644
--- a/src/mainboard/system76/tgl-u/variants/galp5/overridetree.cb
+++ b/src/mainboard/system76/tgl-u/variants/galp5/overridetree.cb
@@ -51,19 +51,21 @@ chip soc/intel/tigerlake
end
device ref south_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)" # J_USB3_2
- register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC_SKIP)" # J_TYPEC1 CH0
- register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)" # J_USB3_1
- register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC_SKIP)" # J_TYPEC1 CH1
+ 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), /* J_USB3_2 */
+ [1] = USB3_PORT_DEFAULT(OC_SKIP), /* J_TYPEC1 CH0 */
+ [2] = USB3_PORT_DEFAULT(OC_SKIP), /* J_USB3_1 */
+ [3] = USB3_PORT_DEFAULT(OC_SKIP), /* J_TYPEC1 CH1 */
+ }"
# ACPI
chip drivers/usb/acpi
device ref xhci_root_hub on
diff --git a/src/mainboard/system76/tgl-u/variants/lemp10/overridetree.cb b/src/mainboard/system76/tgl-u/variants/lemp10/overridetree.cb
index 3be5b5ceab..671cdc4a54 100644
--- a/src/mainboard/system76/tgl-u/variants/lemp10/overridetree.cb
+++ b/src/mainboard/system76/tgl-u/variants/lemp10/overridetree.cb
@@ -52,15 +52,17 @@ chip soc/intel/tigerlake
end
device ref south_xhci on
- # USB2
- register "usb2_ports[0]" = "USB2_PORT_MID(OC_SKIP)" # J_USB3_1
- register "usb2_ports[1]" = "USB2_PORT_MID(OC_SKIP)" # J_USB3_2
- register "usb2_ports[2]" = "USB2_PORT_TYPE_C(OC_SKIP)" # J_TYPEC1
- 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)" # J_USB3_1
- register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC_SKIP)" # J_USB3_2
+ register "usb2_ports" = "{
+ [0] = USB2_PORT_MID(OC_SKIP), /* J_USB3_1 */
+ [1] = USB2_PORT_MID(OC_SKIP), /* J_USB3_2 */
+ [2] = USB2_PORT_TYPE_C(OC_SKIP), /* J_TYPEC1 */
+ [6] = USB2_PORT_MID(OC_SKIP), /* Camera */
+ [9] = USB2_PORT_MID(OC_SKIP), /* Bluetooth */
+ }"
+ register "usb3_ports" = "{
+ [0] = USB3_PORT_DEFAULT(OC_SKIP), /* J_USB3_1 */
+ [1] = USB3_PORT_DEFAULT(OC_SKIP), /* J_USB3_2 */
+ }"
# ACPI
chip drivers/usb/acpi
device ref xhci_root_hub on