summaryrefslogtreecommitdiff
path: root/src/mainboard/system76/oryp6
diff options
context:
space:
mode:
authorFelix Singer <felixsinger@posteo.net>2023-10-26 15:02:46 +0200
committerFelix Singer <service+coreboot-gerrit@felixsinger.de>2023-10-30 14:00:37 +0000
commitd163253ba047515e3317e9da38aa7cc5714a7f0c (patch)
tree0c0c7148194fb268d1ed23159df08f444c8a701b /src/mainboard/system76/oryp6
parent1fd4d76043ca66be134dad16a8ba67ae75645ee6 (diff)
mb/system76/cannonlake/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: I92414efc9ddb849ceb8b9c4f0bc564bdbd92773b Signed-off-by: Felix Singer <felixsinger@posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/78638 Reviewed-by: Tim Crawford <tcrawford@system76.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/system76/oryp6')
-rw-r--r--src/mainboard/system76/oryp6/devicetree.cb28
1 files changed, 15 insertions, 13 deletions
diff --git a/src/mainboard/system76/oryp6/devicetree.cb b/src/mainboard/system76/oryp6/devicetree.cb
index a05b5bd9e6..c0c1b4a12a 100644
--- a/src/mainboard/system76/oryp6/devicetree.cb
+++ b/src/mainboard/system76/oryp6/devicetree.cb
@@ -72,19 +72,21 @@ chip soc/intel/cannonlake
device pci 12.6 off end # GSPI #2
device pci 13.0 off end # Integrated Sensor Hub
device pci 14.0 on # USB xHCI
- # USB2
- register "usb2_ports[0]" = "USB2_PORT_MID(OC_SKIP)" # USB 3 Left
- register "usb2_ports[1]" = "USB2_PORT_TYPE_C(OC_SKIP)" # Type-C
- register "usb2_ports[2]" = "USB2_PORT_MID(OC_SKIP)" # USB 3 Right 1
- register "usb2_ports[3]" = "USB2_PORT_MID(OC_SKIP)" # USB 3 Right 2
- register "usb2_ports[4]" = "USB2_PORT_MID(OC_SKIP)" # Per-key RGB
- register "usb2_ports[7]" = "USB2_PORT_MID(OC_SKIP)" # Camera
- register "usb2_ports[10]" = "USB2_PORT_MID(OC_SKIP)" # Fingerprint
- register "usb2_ports[13]" = "USB2_PORT_MID(OC_SKIP)" # Bluetooth
- # USB3
- register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC_SKIP)" # USB 3 Left
- register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)" # USB 3 right 1
- register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC_SKIP)" # USB 3 right 2
+ register "usb2_ports" = "{
+ [0] = USB2_PORT_MID(OC_SKIP), /* USB 3 Left */
+ [1] = USB2_PORT_TYPE_C(OC_SKIP), /* Type-C */
+ [2] = USB2_PORT_MID(OC_SKIP), /* USB 3 Right 1 */
+ [3] = USB2_PORT_MID(OC_SKIP), /* USB 3 Right 2 */
+ [4] = USB2_PORT_MID(OC_SKIP), /* Per-key RGB */
+ [7] = USB2_PORT_MID(OC_SKIP), /* Camera */
+ [10] = USB2_PORT_MID(OC_SKIP), /* Fingerprint */
+ [13] = USB2_PORT_MID(OC_SKIP), /* Bluetooth */
+ }"
+ register "usb3_ports" = "{
+ [0] = USB3_PORT_DEFAULT(OC_SKIP), /* USB 3 Left */
+ [2] = USB3_PORT_DEFAULT(OC_SKIP), /* USB 3 right 1 */
+ [3] = USB3_PORT_DEFAULT(OC_SKIP), /* USB 3 right 2 */
+ }"
end
device pci 14.1 off end # USB xDCI (OTG)
device pci 14.2 on end # Shared SRAM