diff options
| author | Felix Singer <felixsinger@posteo.net> | 2023-10-23 16:26:20 +0200 |
|---|---|---|
| committer | Felix Singer <service+coreboot-gerrit@felixsinger.de> | 2023-10-27 16:34:23 +0000 |
| commit | cc93db94351a0abb7ae4d8d3fd70209e31f830e1 (patch) | |
| tree | c08f5e2d2fc5bade68eae2868a3415c19865c17b /src/mainboard/intel/saddlebrook | |
| parent | 7a4583a41706896725a00d9555b37e3a9fdea5d2 (diff) | |
mb/intel/skylake/devicetree: 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 will be moved
into the devicetree to their related root ports at some later point.
While on it, remove superfluous comments related to modified lines.
Change-Id: I769233a5baabbea920c9085f8008071ba34bb9dd
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78598
Reviewed-by: Eric Lai <ericllai@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/intel/saddlebrook')
| -rw-r--r-- | src/mainboard/intel/saddlebrook/devicetree.cb | 54 |
1 files changed, 29 insertions, 25 deletions
diff --git a/src/mainboard/intel/saddlebrook/devicetree.cb b/src/mainboard/intel/saddlebrook/devicetree.cb index c344819225..ecb5e8c4f1 100644 --- a/src/mainboard/intel/saddlebrook/devicetree.cb +++ b/src/mainboard/intel/saddlebrook/devicetree.cb @@ -126,31 +126,35 @@ chip soc/intel/skylake # USB related register "SsicPortEnable" = "1" - register "usb2_ports[0]" = "USB2_PORT_MID(OC_SKIP)" # OTG - register "usb2_ports[1]" = "USB2_PORT_MID(OC3)" # Touch Pad - register "usb2_ports[2]" = "USB2_PORT_MID(OC_SKIP)" # M.2 BT - register "usb2_ports[3]" = "USB2_PORT_MID(OC_SKIP)" # Touch Panel - register "usb2_ports[4]" = "USB2_PORT_MID(OC_SKIP)" # M.2 WWAN - register "usb2_ports[5]" = "USB2_PORT_MID(OC0)" # Front Panel - register "usb2_ports[6]" = "USB2_PORT_MID(OC0)" # Front Panel - register "usb2_ports[7]" = "USB2_PORT_MID(OC2)" # Stacked conn (lan + usb) - register "usb2_ports[8]" = "USB2_PORT_MID(OC2)" # Stacked conn (lan + usb) - register "usb2_ports[9]" = "USB2_PORT_MID(OC1)" # LAN MAGJACK - register "usb2_ports[10]" = "USB2_PORT_MID(OC1)" # LAN MAGJACK - register "usb2_ports[11]" = "USB2_PORT_MID(OC_SKIP)" # Finger print sensor - register "usb2_ports[12]" = "USB2_PORT_MID(OC4)" # USB 2 stack conn - register "usb2_ports[13]" = "USB2_PORT_MID(OC4)" # USB 2 stack conn - - register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC5)" # OTG - register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC_SKIP)" # M.2 WWAN - register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC3)" # Flex - register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC_SKIP)" # IVCAM - register "usb3_ports[4]" = "USB3_PORT_DEFAULT(OC1)" # LAN MAGJACK - register "usb3_ports[5]" = "USB3_PORT_DEFAULT(OC0)" # Front Panel - register "usb3_ports[6]" = "USB3_PORT_DEFAULT(OC0)" # Front Panel - register "usb3_ports[7]" = "USB3_PORT_DEFAULT(OC2)" # Stack Conn - register "usb3_ports[8]" = "USB3_PORT_DEFAULT(OC2)" # Stack Conn - register "usb3_ports[9]" = "USB3_PORT_DEFAULT(OC1)" # LAN MAGJACK + register "usb2_ports" = "{ + [0] = USB2_PORT_MID(OC_SKIP), /* OTG */ + [1] = USB2_PORT_MID(OC3), /* Touch Pad */ + [2] = USB2_PORT_MID(OC_SKIP), /* M.2 BT */ + [3] = USB2_PORT_MID(OC_SKIP), /* Touch Panel */ + [4] = USB2_PORT_MID(OC_SKIP), /* M.2 WWAN */ + [5] = USB2_PORT_MID(OC0), /* Front Panel */ + [6] = USB2_PORT_MID(OC0), /* Front Panel */ + [7] = USB2_PORT_MID(OC2), /* Stacked conn (lan + usb) */ + [8] = USB2_PORT_MID(OC2), /* Stacked conn (lan + usb) */ + [9] = USB2_PORT_MID(OC1), /* LAN MAGJACK */ + [10] = USB2_PORT_MID(OC1), /* LAN MAGJACK */ + [11] = USB2_PORT_MID(OC_SKIP), /* Finger print sensor */ + [12] = USB2_PORT_MID(OC4), /* USB 2 stack conn */ + [13] = USB2_PORT_MID(OC4), /* USB 2 stack conn */ + }" + + register "usb3_ports" = "{ + [0] = USB3_PORT_DEFAULT(OC5), /* OTG */ + [1] = USB3_PORT_DEFAULT(OC_SKIP), /* M.2 WWAN */ + [2] = USB3_PORT_DEFAULT(OC3), /* Flex */ + [3] = USB3_PORT_DEFAULT(OC_SKIP), /* IVCAM */ + [4] = USB3_PORT_DEFAULT(OC1), /* LAN MAGJACK */ + [5] = USB3_PORT_DEFAULT(OC0), /* Front Panel */ + [6] = USB3_PORT_DEFAULT(OC0), /* Front Panel */ + [7] = USB3_PORT_DEFAULT(OC2), /* Stack Conn */ + [8] = USB3_PORT_DEFAULT(OC2), /* Stack Conn */ + [9] = USB3_PORT_DEFAULT(OC1), /* LAN MAGJACK */ + }" register "i2c_voltage[4]" = "I2C_VOLTAGE_1V8" # I2C4 is 1.8V |