From d55ffdd7eb1148f4498fd6af0e8d69a9a9742640 Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Fri, 9 Aug 2024 09:00:42 +0000 Subject: Revert "mb/google/rex: Set cnvi_wifi bluetooth companion device" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 1f1d8d2bcae64baea19d0e947ba5572a45f46eec. Reason for revert: Intel® Wi-Fi 6E AX211 (CNVi) does not need Bluetooth Regulator Domain Settings and therefore, the bluetooth companion device declaration for CNVi is unnecessary. BUG=b:345373187 TEST=Able to build and boot google/karis. Change-Id: I296ddb93659af144e1a82a6b8219c9811c5fe545 Signed-off-by: Subrata Banik Reviewed-on: https://review.coreboot.org/c/coreboot/+/83843 Reviewed-by: YH Lin Reviewed-by: Jérémy Compostella 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 deletions(-) diff --git a/src/mainboard/google/rex/variants/deku/overridetree.cb b/src/mainboard/google/rex/variants/deku/overridetree.cb index 0d8eefe141..fcacbead86 100644 --- a/src/mainboard/google/rex/variants/deku/overridetree.cb +++ b/src/mainboard/google/rex/variants/deku/overridetree.cb @@ -325,7 +325,6 @@ 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 57c7c7320b..c74b51c69b 100644 --- a/src/mainboard/google/rex/variants/karis/overridetree.cb +++ b/src/mainboard/google/rex/variants/karis/overridetree.cb @@ -347,7 +347,6 @@ 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 ddedd1e85e..2c49c4c9bc 100644 --- a/src/mainboard/google/rex/variants/ovis/overridetree.cb +++ b/src/mainboard/google/rex/variants/ovis/overridetree.cb @@ -295,7 +295,6 @@ 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 145ce44112..1d1957a692 100644 --- a/src/mainboard/google/rex/variants/rex0/overridetree.cb +++ b/src/mainboard/google/rex/variants/rex0/overridetree.cb @@ -421,7 +421,6 @@ 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 59984e5f1f..c66b5cb2b9 100644 --- a/src/mainboard/google/rex/variants/screebo/overridetree.cb +++ b/src/mainboard/google/rex/variants/screebo/overridetree.cb @@ -408,7 +408,6 @@ 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 -- cgit v1.2.3