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>
This commit is contained in:
Shelley Chen 2024-01-10 22:41:45 -08:00
parent 72f95ad052
commit 5991754451
2 changed files with 9 additions and 7 deletions

View File

@ -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""

View File

@ -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"