From 29b5f1ddcb164bff639ffb631095ab26013284d7 Mon Sep 17 00:00:00 2001 From: Sean Rhodes Date: Thu, 3 Oct 2024 10:59:16 +0100 Subject: mb/starlabs/*: Add PLD Groups to USB ACPI configuration Change-Id: I6fb228bab06b050ac1a51de46ffe5c0d3d80adfb Signed-off-by: Sean Rhodes Reviewed-on: https://review.coreboot.org/c/coreboot/+/84649 Tested-by: build bot (Jenkins) Reviewed-by: Maxim Polyakov --- .../starlabs/byte_adl/variants/mk_ii/devicetree.cb | 15 +++++++++++++-- .../starlabs/starbook/variants/adl/devicetree.cb | 10 ++++++++++ .../starlabs/starbook/variants/cml/devicetree.cb | 9 +++++++++ .../starlabs/starbook/variants/rpl/devicetree.cb | 14 ++++++++++++-- .../starlabs/starbook/variants/tgl/devicetree.cb | 13 +++++++++++-- .../starlabs/starfighter/variants/rpl/devicetree.cb | 11 ++++++++++- 6 files changed, 65 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/mainboard/starlabs/byte_adl/variants/mk_ii/devicetree.cb b/src/mainboard/starlabs/byte_adl/variants/mk_ii/devicetree.cb index 19dcfd07a5..1d08df282d 100644 --- a/src/mainboard/starlabs/byte_adl/variants/mk_ii/devicetree.cb +++ b/src/mainboard/starlabs/byte_adl/variants/mk_ii/devicetree.cb @@ -29,8 +29,9 @@ chip soc/intel/alderlake chip drivers/usb/acpi device ref tcss_root_hub on chip drivers/usb/acpi - register "desc" = ""USB Type-C"" - register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" + register "desc" = ""USB Type-C"" + register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" + register "group" = "ACPI_PLD_GROUP(0, 0)" device ref tcss_usb3_port1 on end end end @@ -66,51 +67,61 @@ chip soc/intel/alderlake chip drivers/usb/acpi register "desc" = ""USB Type-C"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" + register "group" = "ACPI_PLD_GROUP(0, 0)" device ref usb2_port1 on end end chip drivers/usb/acpi register "desc" = ""Back Top USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 1)" device ref usb2_port2 on end end chip drivers/usb/acpi register "desc" = ""Back Top USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 1)" device ref usb3_port3 on end end chip drivers/usb/acpi register "desc" = ""Back Bottom USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 2)" device ref usb2_port3 on end end chip drivers/usb/acpi register "desc" = ""Back Bottom USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 2)" device ref usb3_port4 on end end chip drivers/usb/acpi register "desc" = ""Front Left USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 3)" device ref usb2_port6 on end end chip drivers/usb/acpi register "desc" = ""Front Left USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 3)" device ref usb3_port2 on end end chip drivers/usb/acpi register "desc" = ""Front Right USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 4)" device ref usb2_port7 on end end chip drivers/usb/acpi register "desc" = ""Front Right USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 4)" device ref usb3_port1 on end end chip drivers/usb/acpi register "desc" = ""Internal Bluetooth"" register "type" = "UPC_TYPE_INTERNAL" + register "group" = "ACPI_PLD_GROUP(0, 5)" device ref usb2_port10 on end end end diff --git a/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb index 0d39dcf08f..e75934cac0 100644 --- a/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb +++ b/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb @@ -58,51 +58,61 @@ chip soc/intel/alderlake chip drivers/usb/acpi register "desc" = ""USB Type-C"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" + register "group" = "ACPI_PLD_GROUP(0, 0)" device ref usb2_port1 on end end chip drivers/usb/acpi register "desc" = ""USB Type-C"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" + register "group" = "ACPI_PLD_GROUP(0, 0)" device ref usb3_port3 on end end chip drivers/usb/acpi register "desc" = ""Left USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 1)" device ref usb2_port3 on end end chip drivers/usb/acpi register "desc" = ""Left USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 1)" device ref usb3_port1 on end end chip drivers/usb/acpi register "desc" = ""Right USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 2)" device ref usb2_port7 on end end chip drivers/usb/acpi register "desc" = ""Right USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 2)" device ref usb3_port2 on end end chip drivers/usb/acpi register "desc" = ""Internal Webcam"" register "type" = "UPC_TYPE_INTERNAL" + register "group" = "ACPI_PLD_GROUP(0, 3)" device ref usb2_port5 on end end chip drivers/usb/acpi register "desc" = ""Fingerprint Reader"" register "type" = "UPC_TYPE_INTERNAL" + register "group" = "ACPI_PLD_GROUP(0, 4)" device ref usb2_port6 on end end chip drivers/usb/acpi register "desc" = ""MicroSD Card Reader"" register "type" = "UPC_TYPE_INTERNAL" + register "group" = "ACPI_PLD_GROUP(0, 5)" device ref usb2_port4 on end end chip drivers/usb/acpi register "desc" = ""Internal Bluetooth"" register "type" = "UPC_TYPE_INTERNAL" + register "group" = "ACPI_PLD_GROUP(0, 6)" device ref usb2_port10 on end end end diff --git a/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb b/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb index 46b6142ebf..af7e18f610 100644 --- a/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb +++ b/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb @@ -64,46 +64,55 @@ chip soc/intel/cannonlake chip drivers/usb/acpi register "desc" = ""USB Type-C"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" + register "group" = "ACPI_PLD_GROUP(0, 0)" device ref usb2_port1 on end end chip drivers/usb/acpi register "desc" = ""USB Type-C"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" + register "group" = "ACPI_PLD_GROUP(0, 0)" device ref usb3_port1 on end end chip drivers/usb/acpi register "desc" = ""Left USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 1)" device ref usb2_port2 on end end chip drivers/usb/acpi register "desc" = ""Left USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 1)" device ref usb3_port2 on end end chip drivers/usb/acpi register "desc" = ""Right USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 2)" device ref usb2_port6 on end end chip drivers/usb/acpi register "desc" = ""Right USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 2)" device ref usb3_port3 on end end chip drivers/usb/acpi register "desc" = ""Internal Webcam"" register "type" = "UPC_TYPE_INTERNAL" + register "group" = "ACPI_PLD_GROUP(0, 3)" device ref usb2_port7 on end end chip drivers/usb/acpi register "desc" = ""MicroSD Card Reader"" register "type" = "UPC_TYPE_INTERNAL" + register "group" = "ACPI_PLD_GROUP(0, 4)" device ref usb2_port4 on end end chip drivers/usb/acpi register "desc" = ""Internal Bluetooth"" register "type" = "UPC_TYPE_INTERNAL" + register "group" = "ACPI_PLD_GROUP(0, 5)" device ref usb2_port10 on end end end diff --git a/src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb index 5eed658a0f..5de5f3c6cb 100644 --- a/src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb +++ b/src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb @@ -52,8 +52,9 @@ chip soc/intel/alderlake chip drivers/usb/acpi device ref tcss_root_hub on chip drivers/usb/acpi - register "desc" = ""USB Type-C"" - register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" + register "desc" = ""USB Type-C"" + register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" + register "group" = "ACPI_PLD_GROUP(0, 0)" device ref tcss_usb3_port1 on end end end @@ -96,46 +97,55 @@ chip soc/intel/alderlake chip drivers/usb/acpi register "desc" = ""USB Type-C"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" + register "group" = "ACPI_PLD_GROUP(0, 0)" device ref usb2_port1 on end end chip drivers/usb/acpi register "desc" = ""Left USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 1)" device ref usb2_port3 on end end chip drivers/usb/acpi register "desc" = ""Left USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 1)" device ref usb3_port1 on end end chip drivers/usb/acpi register "desc" = ""Right USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 2)" device ref usb2_port7 on end end chip drivers/usb/acpi register "desc" = ""Right USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 2)" device ref usb3_port2 on end end chip drivers/usb/acpi register "desc" = ""Internal Webcam"" register "type" = "UPC_TYPE_INTERNAL" + register "group" = "ACPI_PLD_GROUP(0, 3)" device ref usb2_port5 on end end chip drivers/usb/acpi register "desc" = ""Fingerprint Reader"" register "type" = "UPC_TYPE_INTERNAL" + register "group" = "ACPI_PLD_GROUP(0, 4)" device ref usb2_port6 on end end chip drivers/usb/acpi register "desc" = ""MicroSD Card Reader"" register "type" = "UPC_TYPE_INTERNAL" + register "group" = "ACPI_PLD_GROUP(0, 5)" device ref usb2_port4 on end end chip drivers/usb/acpi register "desc" = ""Internal Bluetooth"" register "type" = "UPC_TYPE_INTERNAL" + register "group" = "ACPI_PLD_GROUP(0, 6)" device ref usb2_port10 on end end end diff --git a/src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb index d09c8a9826..ca9e5cf795 100644 --- a/src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb +++ b/src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb @@ -60,8 +60,9 @@ chip soc/intel/tigerlake chip drivers/usb/acpi device ref tcss_root_hub on chip drivers/usb/acpi - register "desc" = ""USB Type-C"" - register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" + register "desc" = ""USB Type-C"" + register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" + register "group" = "ACPI_PLD_GROUP(0, 0)" device ref tcss_usb3_port1 on end end end @@ -101,41 +102,49 @@ chip soc/intel/tigerlake chip drivers/usb/acpi register "desc" = ""USB Type-C"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" + register "group" = "ACPI_PLD_GROUP(0, 0)" device ref usb2_port1 on end end chip drivers/usb/acpi register "desc" = ""Left USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 1)" device ref usb2_port2 on end end chip drivers/usb/acpi register "desc" = ""Left USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 1)" device ref usb3_port1 on end end chip drivers/usb/acpi register "desc" = ""Right USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 2)" device ref usb2_port3 on end end chip drivers/usb/acpi register "desc" = ""Right USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 2)" device ref usb3_port2 on end end chip drivers/usb/acpi register "desc" = ""Internal Webcam"" register "type" = "UPC_TYPE_INTERNAL" + register "group" = "ACPI_PLD_GROUP(0, 3)" device ref usb2_port4 on end end chip drivers/usb/acpi register "desc" = ""MicroSD Card Reader"" register "type" = "UPC_TYPE_INTERNAL" + register "group" = "ACPI_PLD_GROUP(0, 4)" device ref usb2_port6 on end end chip drivers/usb/acpi register "desc" = ""Internal Bluetooth"" register "type" = "UPC_TYPE_INTERNAL" + register "group" = "ACPI_PLD_GROUP(0, 5)" device ref usb2_port10 on end end end diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb b/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb index b022b81ee5..32775f6817 100644 --- a/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb +++ b/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb @@ -61,11 +61,13 @@ chip soc/intel/alderlake chip drivers/usb/acpi register "desc" = ""Left Back USB Type-C"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" + register "group" = "ACPI_PLD_GROUP(0, 0)" device ref tcss_usb3_port1 on end end chip drivers/usb/acpi register "desc" = ""Left Front USB Type-C"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" + register "group" = "ACPI_PLD_GROUP(0, 1)" device ref tcss_usb3_port2 on end end end @@ -112,41 +114,48 @@ chip soc/intel/alderlake chip drivers/usb/acpi register "desc" = ""Left Back USB Type-C"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" + register "group" = "ACPI_PLD_GROUP(0, 0)" device ref usb2_port1 on end end chip drivers/usb/acpi register "desc" = ""Left Front USB Type-C"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" + register "group" = "ACPI_PLD_GROUP(0, 1)" device ref usb2_port2 on end end chip drivers/usb/acpi register "desc" = ""Left USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 2)" device ref usb2_port3 on end end chip drivers/usb/acpi register "desc" = ""Left USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 2)" device ref usb3_port1 on end end chip drivers/usb/acpi register "desc" = ""Right USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 3)" device ref usb2_port6 on end end chip drivers/usb/acpi register "desc" = ""Right USB Type-A"" register "type" = "UPC_TYPE_USB3_A" + register "group" = "ACPI_PLD_GROUP(0, 3)" device ref usb3_port2 on end end chip drivers/usb/acpi register "desc" = ""Internal Webcam"" - register "type" = "UPC_TYPE_INTERNAL" + register "group" = "ACPI_PLD_GROUP(0, 4)" device ref usb2_port5 on end end chip drivers/usb/acpi register "desc" = ""Internal Bluetooth"" register "type" = "UPC_TYPE_INTERNAL" + register "group" = "ACPI_PLD_GROUP(0, 5)" device ref usb2_port10 on end end end -- cgit v1.2.3