From 1f1d8d2bcae64baea19d0e947ba5572a45f46eec Mon Sep 17 00:00:00 2001 From: Jeremy Compostella Date: Mon, 1 Jul 2024 13:36:54 -0700 Subject: [PATCH] mb/google/rex: Set 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. BUG=b:348345301 BRANCH=firmware-rex-15709.B TEST=BRDS method is added to the CNVW device and return the data supplied by the SAR binary blob Change-Id: I7f56ab8ac88c1fbc0b223b4286d2a998e424a46e Signed-off-by: Jeremy Compostella Reviewed-on: https://review.coreboot.org/c/coreboot/+/83299 Reviewed-by: Subrata Banik Tested-by: build bot (Jenkins) --- src/mainboard/google/rex/variants/deku/overridetree.cb | 1 + src/mainboard/google/rex/variants/karis/overridetree.cb | 1 + src/mainboard/google/rex/variants/ovis/overridetree.cb | 1 + src/mainboard/google/rex/variants/rex0/overridetree.cb | 1 + src/mainboard/google/rex/variants/screebo/overridetree.cb | 1 + 5 files changed, 5 insertions(+) diff --git a/src/mainboard/google/rex/variants/deku/overridetree.cb b/src/mainboard/google/rex/variants/deku/overridetree.cb index fcacbead86..0d8eefe141 100644 --- a/src/mainboard/google/rex/variants/deku/overridetree.cb +++ b/src/mainboard/google/rex/variants/deku/overridetree.cb @@ -325,6 +325,7 @@ chip soc/intel/meteorlake register "wake" = "GPE0_PME_B0" register "add_acpi_dma_property" = "true" register "enable_cnvi_ddr_rfim" = "true" + use usb2_port10 as bluetooth_companion device generic 0 on end end end diff --git a/src/mainboard/google/rex/variants/karis/overridetree.cb b/src/mainboard/google/rex/variants/karis/overridetree.cb index c74b51c69b..57c7c7320b 100644 --- a/src/mainboard/google/rex/variants/karis/overridetree.cb +++ b/src/mainboard/google/rex/variants/karis/overridetree.cb @@ -347,6 +347,7 @@ chip soc/intel/meteorlake register "wake" = "GPE0_PME_B0" register "add_acpi_dma_property" = "true" register "enable_cnvi_ddr_rfim" = "true" + use usb2_port10 as bluetooth_companion device generic 0 on probe WIFI_TYPE WIFI_CNVI end diff --git a/src/mainboard/google/rex/variants/ovis/overridetree.cb b/src/mainboard/google/rex/variants/ovis/overridetree.cb index 2c49c4c9bc..ddedd1e85e 100644 --- a/src/mainboard/google/rex/variants/ovis/overridetree.cb +++ b/src/mainboard/google/rex/variants/ovis/overridetree.cb @@ -295,6 +295,7 @@ chip soc/intel/meteorlake register "wake" = "GPE0_PME_B0" register "add_acpi_dma_property" = "true" register "enable_cnvi_ddr_rfim" = "true" + use usb2_port10 as bluetooth_companion device generic 0 on end end end diff --git a/src/mainboard/google/rex/variants/rex0/overridetree.cb b/src/mainboard/google/rex/variants/rex0/overridetree.cb index 1d1957a692..145ce44112 100644 --- a/src/mainboard/google/rex/variants/rex0/overridetree.cb +++ b/src/mainboard/google/rex/variants/rex0/overridetree.cb @@ -421,6 +421,7 @@ chip soc/intel/meteorlake register "wake" = "GPE0_PME_B0" register "add_acpi_dma_property" = "true" register "enable_cnvi_ddr_rfim" = "true" + use usb2_port10 as bluetooth_companion device generic 0 on probe WIFI WIFI_CNVI end diff --git a/src/mainboard/google/rex/variants/screebo/overridetree.cb b/src/mainboard/google/rex/variants/screebo/overridetree.cb index c66b5cb2b9..59984e5f1f 100644 --- a/src/mainboard/google/rex/variants/screebo/overridetree.cb +++ b/src/mainboard/google/rex/variants/screebo/overridetree.cb @@ -408,6 +408,7 @@ chip soc/intel/meteorlake register "wake" = "GPE0_PME_B0" register "add_acpi_dma_property" = "true" register "enable_cnvi_ddr_rfim" = "true" + use usb2_port10 as bluetooth_companion device generic 0 on end end end