Skip to content

Commit b98c4be

Browse files
committed
mb/clevo/tgl-u: update dt syntax for usb ports
Change-Id: I433dfcef9d1cf8f34299a16e0478edfbfe5ae717 Signed-off-by: Michał Kopeć <[email protected]>
1 parent 9f36b42 commit b98c4be

File tree

2 files changed

+29
-14
lines changed

2 files changed

+29
-14
lines changed

src/mainboard/clevo/tgl-u/variants/ns50mu/devicetree.cb

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,20 @@ chip soc/intel/tigerlake
100100
end
101101

102102
device ref south_xhci on
103+
register "usb2_ports" = "{
104+
[0] = USB2_PORT_MID(OC_SKIP), // USB-A daughterboard
105+
[1] = USB2_PORT_TYPE_C(OC_SKIP), // USB-C mainboard
106+
[2] = USB2_PORT_MID(OC_SKIP), // USB-A mainboard
107+
[4] = USB2_PORT_MID(OC_SKIP), // Fingerprint Reader
108+
[5] = USB2_PORT_TYPE_C(OC_SKIP), // TBT USB-C
109+
[6] = USB2_PORT_MID(OC_SKIP), // CCD
110+
[9] = USB2_PORT_MID(OC_SKIP), // BT
111+
}"
112+
register "usb3_ports" = "{
113+
[1] = USB3_PORT_DEFAULT(OC_SKIP), // USB-C port2 (lane 0)
114+
[2] = USB3_PORT_DEFAULT(OC_SKIP), // USB-A port3
115+
[3] = USB3_PORT_DEFAULT(OC_SKIP), // USB-C port4 (lane 1)
116+
}"
103117
# USB2
104118
register "usb2_ports[0]" = "USB2_PORT_LONG(OC_SKIP)" # USB-A daughterboard
105119
register "usb2_ports[1]" = "USB2_PORT_TYPE_C(OC_SKIP)" # USB-C motherboard

src/mainboard/clevo/tgl-u/variants/nv40mz/devicetree.cb

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -100,20 +100,21 @@ chip soc/intel/tigerlake
100100
end
101101

102102
device ref south_xhci on
103-
# USB2
104-
register "usb2_ports[0]" = "USB2_PORT_MID(OC_SKIP)" # USB-A port1
105-
register "usb2_ports[1]" = "USB2_PORT_TYPE_C(OC_SKIP)" # USB-C port2
106-
register "usb2_ports[2]" = "USB2_PORT_MID(OC_SKIP)" # USB-A port3
107-
register "usb2_ports[4]" = "USB2_PORT_MID(OC_SKIP)" # Finger
108-
register "usb2_ports[5]" = "USB2_PORT_TYPE_C(OC_SKIP)" # TBT USB-C
109-
register "usb2_ports[6]" = "USB2_PORT_MID(OC_SKIP)" # CCD
110-
register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" # BT
111-
# USB3
112-
register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC_SKIP)" # USB-A port1
113-
register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC_SKIP)" # USB-C port2 (right port, lane 0)
114-
register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)" # USB-A port3
115-
register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC_SKIP)" # USB-C port4 (right port, lane 1)
116-
# ACPI
103+
register "usb2_ports" = "{
104+
[0] = USB2_PORT_MID(OC_SKIP), // USB-A port1
105+
[1] = USB2_PORT_TYPE_C(OC_SKIP), // USB-C port2
106+
[2] = USB2_PORT_MID(OC_SKIP), // USB-A port3
107+
[4] = USB2_PORT_MID(OC_SKIP), // Fingerprint Reader
108+
[5] = USB2_PORT_TYPE_C(OC_SKIP), // TBT USB-C
109+
[6] = USB2_PORT_MID(OC_SKIP), // CCD
110+
[9] = USB2_PORT_MID(OC_SKIP), // BT
111+
}"
112+
register "usb3_ports" = "{
113+
[0] = USB3_PORT_DEFAULT(OC_SKIP), // USB-A port1
114+
[1] = USB3_PORT_DEFAULT(OC_SKIP), // USB-C port2 (right port, lane 0)
115+
[2] = USB3_PORT_DEFAULT(OC_SKIP), // USB-A port3
116+
[3] = USB3_PORT_DEFAULT(OC_SKIP), // USB-C port4 (right port, lane 1)
117+
}"
117118
chip drivers/usb/acpi
118119
device ref xhci_root_hub on
119120
chip drivers/usb/acpi

0 commit comments

Comments
 (0)