[XS] Change in coreboot[main]: mb/intel/mtlrvp: Set USB2-10 as cnvi_wifi bluetooth companion device

[Jérémy Compostella (Code Review)]

Jérémy Compostella has submitted this change. ( https://review.coreboot.org/c/coreboot/+/83310?usp=email )

Change subject: mb/intel/mtlrvp: Set USB2-10 as cnvi_wifi bluetooth companion device
......................................................................

mb/intel/mtlrvp: Set USB2-10 as cnvi_wifi bluetooth companion device

To publish the Bluetooth Regulator Domain Settings under the right
ACPI device scope, the wifi generic driver requires the bluetooth
companion to be set accordingly.

This commit also updates the USB2 port 10 description and set its type
to the more appropriate `UPC_TYPE_INTERNAL' type.

BUG=b:348345301
TEST=BRDS method is added to the CNVW device and returns the data
     supplied by the SAR binary blob

Change-Id: I66c9b75d2aaa1b221313b037defcd2c579fd6b61
Signed-off-by: Jeremy Compostella 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/83310
Tested-by: build bot (Jenkins) 
Reviewed-by: Subrata Banik 
Reviewed-by: Cliff Huang 
---
M src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp_p/devicetree.cb
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Cliff Huang: Looks good to me, but someone else must approve
  Subrata Banik: Looks good to me, approved
  build bot (Jenkins): Verified

diff --git a/src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp_p/devicetree.cb b/src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp_p/devicetree.cb
index a0f27f0..010cae2 100644
--- a/src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp_p/devicetree.cb
+++ b/src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp_p/devicetree.cb
@@ -402,8 +402,8 @@
    					device ref usb2_port9 on end
    				end
    				chip drivers/usb/acpi
-						register "desc" = ""USB2 Type-A Port 10""
-						register "type" = "UPC_TYPE_A"
+						register "desc" = ""USB2 Bluetooth""
+						register "type" = "UPC_TYPE_INTERNAL"
    					register "group" = "ACPI_PLD_GROUP(10, 1)"
    					device ref usb2_port10 on end
    				end
@@ -426,6 +426,7 @@
    		chip drivers/wifi/generic
    			register "wake" = "GPE0_PME_B0"
    			register "enable_cnvi_ddr_rfim" = "true"
+				use usb2_port10 as bluetooth_companion
    			device generic 0 on end
    		end
    	end