Matt DeVillier has submitted this change. ( https://review.coreboot.org/c/coreboot/+/86540?usp=email )
Change subject: mb/google/nissa/var/dirks: Add fw_config probe for WIFI Type ......................................................................
mb/google/nissa/var/dirks: Add fw_config probe for WIFI Type
Use fw_config to probe WIFI Type.
BUG=b:389391653 TEST=emerge-nissa coreboot
Change-Id: Iaefda61e4929d48f02ce7190e9e45d70b32b75e3 Signed-off-by: David Wu david_wu@quanta.corp-partner.google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/86540 Reviewed-by: Eric Lai ericllai@google.com Reviewed-by: Ivy Jian ivy.jian@quanta.corp-partner.google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/google/brya/variants/dirks/overridetree.cb 1 file changed, 34 insertions(+), 5 deletions(-)
Approvals: Eric Lai: Looks good to me, approved Ivy Jian: Looks good to me, approved build bot (Jenkins): Verified
diff --git a/src/mainboard/google/brya/variants/dirks/overridetree.cb b/src/mainboard/google/brya/variants/dirks/overridetree.cb index a953b4c..8b7bc43 100644 --- a/src/mainboard/google/brya/variants/dirks/overridetree.cb +++ b/src/mainboard/google/brya/variants/dirks/overridetree.cb @@ -1,3 +1,15 @@ +fw_config + field WIFI_SAR_ID 0 0 + option ID_0 0 + option ID_1 1 + end + field WIFI_TYPE 1 2 + option WIFI_ALL 0 + option WIFI_CNVI 1 + option WIFI_PCIE 2 + end +end + chip soc/intel/alderlake
register "sagv" = "SaGv_Enabled" @@ -184,7 +196,10 @@ device ref cnvi_wifi on chip drivers/wifi/generic register "enable_cnvi_ddr_rfim" = "true" - device generic 0 on end + device generic 0 on + probe WIFI_TYPE WIFI_CNVI + probe WIFI_TYPE WIFI_ALL + end end end device ref i2c3 on @@ -209,6 +224,8 @@ end device ref pcie_rp11 on # Enable wlan PCIe 11 using clk 2 + probe WIFI_TYPE WIFI_PCIE + probe WIFI_TYPE WIFI_ALL register "pch_pcie_rp[PCH_RP(10)]" = "{ .clk_src = 2, .clk_req = 2, @@ -218,13 +235,19 @@ register "wake" = "GPE0_DW1_03" register "add_acpi_dma_property" = "true" use usb2_port8 as bluetooth_companion - device pci 00.0 on end + device pci 00.0 on + probe WIFI_TYPE WIFI_PCIE + probe WIFI_TYPE WIFI_ALL + end end chip soc/intel/common/block/pcie/rtd3 register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_B11)" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_H20)" register "srcclk_pin" = "2" - device generic 0 on end + device generic 0 on + probe WIFI_TYPE WIFI_PCIE + probe WIFI_TYPE WIFI_ALL + end end end device ref emmc on end @@ -315,14 +338,20 @@ register "type" = "UPC_TYPE_INTERNAL" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D4)" - device ref usb2_port8 on end + device ref usb2_port8 on + probe WIFI_TYPE WIFI_PCIE + probe WIFI_TYPE WIFI_ALL + end end chip drivers/usb/acpi register "desc" = ""CNVI Bluetooth"" register "type" = "UPC_TYPE_INTERNAL" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D4)" - device ref usb2_port10 on end + device ref usb2_port10 on + probe WIFI_TYPE WIFI_CNVI + probe WIFI_TYPE WIFI_ALL + end end chip drivers/usb/acpi register "desc" = ""USB3 Type-A Port A1""