From 1f430614fd74b1053acecb551b22bc29f0f45b96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kope=C4=87?= Date: Tue, 4 Mar 2025 12:34:40 +0100 Subject: [PATCH] mb/novacustom/mtl-h/devicetree.cb: Move USB cfg to xhci device nodes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move all USB configuration from the parent SOC node to the appropriate XHCI controller device nodes in the devicetree. Change-Id: Ib702b132698bcb71b4e7b6fa51c6a428bfe77252 Signed-off-by: Michał Kopeć Reviewed-on: https://review.coreboot.org/c/coreboot/+/86708 Tested-by: build bot (Jenkins) Reviewed-by: Michał Żygowski --- src/mainboard/novacustom/mtl-h/devicetree.cb | 37 ++++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/src/mainboard/novacustom/mtl-h/devicetree.cb b/src/mainboard/novacustom/mtl-h/devicetree.cb index ef29ec18ce..22eceacb1a 100644 --- a/src/mainboard/novacustom/mtl-h/devicetree.cb +++ b/src/mainboard/novacustom/mtl-h/devicetree.cb @@ -24,25 +24,6 @@ chip soc/intel/meteorlake # Thermal register "tcc_offset" = "10" # TCC of 100C - register "usb2_ports" = "{ - [0] = USB2_PORT_LONG(OC_SKIP), /* USB Type-A Port 1 (Left) */ - [1] = USB2_PORT_TYPE_C(OC_SKIP), /* USB Type-C Port 1 (Non-TBT) */ - [2] = USB2_PORT_MID(OC_SKIP), /* USB Type-A Port 2 (Right) */ - [5] = USB2_PORT_TYPE_C(OC_SKIP), /* USB Type-C Port 2 (TBT) */ - [6] = USB2_PORT_LONG(OC_SKIP), /* Integrated Camera */ - [9] = USB2_PORT_MID(OC_SKIP), /* Bluetooth on M.2 2230 */ - }" - - register "usb3_ports" = "{ - [0] = USB3_PORT_DEFAULT(OC_SKIP), /* USB Type-A Port 1 (Left) */ - [1] = USB3_PORT_DEFAULT(OC_SKIP), /* USB Type-A Port 2 (Right) */ - }" - - register "tcss_ports" = "{ - [0] = TCSS_PORT_DEFAULT(OC_SKIP), /* USB Type-C Port 1 (TBT) */ - [1] = TCSS_PORT_DEFAULT(OC_SKIP), /* USB Type-C Port 2 (Non-TBT) */ - }" - device cpu_cluster 0 on end device domain 0 on subsystemid 0x1558 0xa743 inherit @@ -109,6 +90,11 @@ chip soc/intel/meteorlake device ref crashlog on end device ref vpu on end device ref tcss_xhci on + register "tcss_ports" = "{ + [0] = TCSS_PORT_DEFAULT(OC_SKIP), /* USB Type-C Port 1 (TBT) */ + [1] = TCSS_PORT_DEFAULT(OC_SKIP), /* USB Type-C Port 2 (Non-TBT) */ + }" + chip drivers/usb/acpi device ref tcss_root_hub on chip drivers/usb/acpi @@ -137,6 +123,19 @@ chip soc/intel/meteorlake end device ref ioe_shared_sram on end device ref xhci on + register "usb2_ports" = "{ + [0] = USB2_PORT_LONG(OC_SKIP), /* USB Type-A Port 1 (Left) */ + [1] = USB2_PORT_TYPE_C(OC_SKIP), /* USB Type-C Port 1 (Non-TBT) */ + [2] = USB2_PORT_MID(OC_SKIP), /* USB Type-A Port 2 (Right) */ + [5] = USB2_PORT_TYPE_C(OC_SKIP), /* USB Type-C Port 2 (TBT) */ + [6] = USB2_PORT_LONG(OC_SKIP), /* Integrated Camera */ + [9] = USB2_PORT_MID(OC_SKIP), /* Bluetooth on M.2 2230 */ + }" + + register "usb3_ports" = "{ + [0] = USB3_PORT_DEFAULT(OC_SKIP), /* USB Type-A Port 1 (Left) */ + [1] = USB3_PORT_DEFAULT(OC_SKIP), /* USB Type-A Port 2 (Right) */ + }" chip drivers/usb/acpi device ref xhci_root_hub on chip drivers/usb/acpi