Subrata Banik has submitted this change. ( https://review.coreboot.org/c/coreboot/+/83843?usp=email )
Change subject: Revert "mb/google/rex: Set cnvi_wifi bluetooth companion device" ......................................................................
Revert "mb/google/rex: Set cnvi_wifi bluetooth companion device"
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 subratabanik@google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/83843 Reviewed-by: YH Lin yueherngl@google.com Reviewed-by: Jérémy Compostella jeremy.compostella@intel.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/google/rex/variants/deku/overridetree.cb M src/mainboard/google/rex/variants/karis/overridetree.cb M src/mainboard/google/rex/variants/ovis/overridetree.cb M src/mainboard/google/rex/variants/rex0/overridetree.cb M src/mainboard/google/rex/variants/screebo/overridetree.cb 5 files changed, 0 insertions(+), 5 deletions(-)
Approvals: build bot (Jenkins): Verified YH Lin: Looks good to me, approved Jérémy Compostella: Looks good to me, but someone else must approve
diff --git a/src/mainboard/google/rex/variants/deku/overridetree.cb b/src/mainboard/google/rex/variants/deku/overridetree.cb index 0d8eefe..fcacbea 100644 --- a/src/mainboard/google/rex/variants/deku/overridetree.cb +++ b/src/mainboard/google/rex/variants/deku/overridetree.cb @@ -325,7 +325,6 @@ 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 57c7c73..c74b51c 100644 --- a/src/mainboard/google/rex/variants/karis/overridetree.cb +++ b/src/mainboard/google/rex/variants/karis/overridetree.cb @@ -347,7 +347,6 @@ 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 ddedd1e..2c49c4c 100644 --- a/src/mainboard/google/rex/variants/ovis/overridetree.cb +++ b/src/mainboard/google/rex/variants/ovis/overridetree.cb @@ -295,7 +295,6 @@ 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 145ce44..1d1957a 100644 --- a/src/mainboard/google/rex/variants/rex0/overridetree.cb +++ b/src/mainboard/google/rex/variants/rex0/overridetree.cb @@ -421,7 +421,6 @@ 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 59984e5..c66b5cb 100644 --- a/src/mainboard/google/rex/variants/screebo/overridetree.cb +++ b/src/mainboard/google/rex/variants/screebo/overridetree.cb @@ -408,7 +408,6 @@ 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