summaryrefslogtreecommitdiff
path: root/src/mainboard/google
diff options
context:
space:
mode:
authorShelley Chen <shchen@google.com>2024-01-10 22:41:45 -0800
committerShelley Chen <shchen@google.com>2024-01-23 04:57:49 +0000
commit59917544517a8da047c588a36d4c1ce493653adf (patch)
tree8617851b67dd15b2acfeaf1d439210f7d5b55d7d /src/mainboard/google
parent72f95ad0522b1a51773551c46988495dba6a1128 (diff)
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>
Diffstat (limited to 'src/mainboard/google')
-rw-r--r--src/mainboard/google/brox/variants/baseboard/brox/devicetree.cb7
-rw-r--r--src/mainboard/google/brox/variants/brox/overridetree.cb9
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 5589bbe356..fd2c8ed72f 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 @@ chip soc/intel/alderlake
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 dc1866323f..af7c84cf8e 100644
--- a/src/mainboard/google/brox/variants/brox/overridetree.cb
+++ b/src/mainboard/google/brox/variants/brox/overridetree.cb
@@ -195,6 +195,15 @@ chip soc/intel/alderlake
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"