Shelley Chen submitted this change.
mb/google/brox: Move cnvi to overridetree
We need to disable the cnvi device when pcie wifi is enabled, so need
to use the FW_CONFIG defined in the overridetree for this.
BUG=b:311450057,b:300690448,b:319188820
BRANCH=None
TEST=This will be tested on the device when received
Change-Id: If9e861db37e321fd69c09f9b4aafa2e212f92caa
Signed-off-by: Shelley Chen <shchen@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79898
Reviewed-by: Nick Vaccaro <nvaccaro@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M src/mainboard/google/brox/variants/baseboard/brox/devicetree.cb
M src/mainboard/google/brox/variants/brox/overridetree.cb
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/mainboard/google/brox/variants/baseboard/brox/devicetree.cb b/src/mainboard/google/brox/variants/baseboard/brox/devicetree.cb
index 5589bbe..fd2c8ed 100644
--- a/src/mainboard/google/brox/variants/baseboard/brox/devicetree.cb
+++ b/src/mainboard/google/brox/variants/baseboard/brox/devicetree.cb
@@ -161,13 +161,6 @@
device ref tcss_dma1 on end
device ref xhci on end
device ref shared_sram on end
- device ref cnvi_wifi on
- chip drivers/wifi/generic
- register "wake" = "GPE0_PME_B0"
- register "add_acpi_dma_property" = "true"
- device generic 0 on end
- end
- end
device ref i2c0 on
chip drivers/i2c/generic
register "hid" = ""ELAN0000""
diff --git a/src/mainboard/google/brox/variants/brox/overridetree.cb b/src/mainboard/google/brox/variants/brox/overridetree.cb
index dc18663..af7c84c 100644
--- a/src/mainboard/google/brox/variants/brox/overridetree.cb
+++ b/src/mainboard/google/brox/variants/brox/overridetree.cb
@@ -195,6 +195,15 @@
end
probe WIFI WIFI_PCIE
end
+ device ref cnvi_wifi on
+ chip drivers/wifi/generic
+ register "wake" = "GPE0_PME_B0"
+ register "add_acpi_dma_property" = "true"
+ register "enable_cnvi_ddr_rfim" = "true"
+ device generic 0 on end
+ end
+ probe WIFI WIFI_CNVI
+ end
device ref ish on
chip drivers/intel/ish
register "add_acpi_dma_property" = "true"
To view, visit change 79898. To unsubscribe, or for help writing mail filters, visit settings.