diff options
| author | Ashish Kumar Mishra <ashish.k.mishra@intel.com> | 2024-02-15 16:52:10 +0530 |
|---|---|---|
| committer | Shelley Chen <shchen@google.com> | 2024-02-17 00:25:44 +0000 |
| commit | 63f0ebf1d7b69f4fdb9f067a4be95b6d0f7ea680 (patch) | |
| tree | 9ec1fbd1e2d181991f94c5e0b72b726624d8089b | |
| parent | b54045fcba32da0972a5dff93699feaa650aaa03 (diff) | |
mb/google/brox: Handle bluetooth enable on devices
For devices that require CNVi Bluetooth select WIFI_BT_CNVI
in FW_CONFIG. Discrete Bluetooth devices need to select
WIFI_BT_PCIE.
BUG=b:319188820,b:325084796
BRANCH=None
TEST=Boot image on SKU1,SKU2 and check BT devices enumerate.
Change-Id: Iba008682fcfa7ddc1ec400649c8742c721666f1d
Signed-off-by: Ashish Kumar Mishra <ashish.k.mishra@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80564
Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
Reviewed-by: Shelley Chen <shchen@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/mainboard/google/brox/variants/brox/overridetree.cb | 10 | ||||
| -rw-r--r-- | src/mainboard/google/brox/variants/brox/variant.c | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/mainboard/google/brox/variants/brox/overridetree.cb b/src/mainboard/google/brox/variants/brox/overridetree.cb index d13b276db3..a0e83b2b2f 100644 --- a/src/mainboard/google/brox/variants/brox/overridetree.cb +++ b/src/mainboard/google/brox/variants/brox/overridetree.cb @@ -9,9 +9,9 @@ fw_config option STORAGE_UFS 1 option STORAGE_NVME 2 end - field WIFI 4 4 - option WIFI_CNVI 0 - option WIFI_PCIE 1 + field WIFI_BT 4 4 + option WIFI_BT_CNVI 0 + option WIFI_BT_PCIE 1 end field AUDIO 5 7 option AUDIO_UNKNOWN 0 @@ -194,7 +194,7 @@ chip soc/intel/alderlake register "srcclk_pin" = "1" device generic 0 on end end - probe WIFI WIFI_PCIE + probe WIFI_BT WIFI_BT_PCIE end device ref cnvi_wifi on chip drivers/wifi/generic @@ -203,7 +203,7 @@ chip soc/intel/alderlake register "enable_cnvi_ddr_rfim" = "true" device generic 0 on end end - probe WIFI WIFI_CNVI + probe WIFI_BT WIFI_BT_CNVI end device ref ish on chip drivers/intel/ish diff --git a/src/mainboard/google/brox/variants/brox/variant.c b/src/mainboard/google/brox/variants/brox/variant.c index 39162d5bf6..e085a86ff8 100644 --- a/src/mainboard/google/brox/variants/brox/variant.c +++ b/src/mainboard/google/brox/variants/brox/variant.c @@ -8,9 +8,13 @@ void variant_update_soc_chip_config(struct soc_intel_alderlake_config *config) { + if (fw_config_probe(FW_CONFIG(WIFI_BT, WIFI_BT_CNVI))) { + printk(BIOS_INFO, "CNVi bluetooth enabled by fw_config\n"); + config->cnvi_bt_core = true; + } } const char *get_wifi_sar_cbfs_filename(void) { - return get_wifi_sar_fw_config_filename(FW_CONFIG_FIELD(WIFI)); + return get_wifi_sar_fw_config_filename(FW_CONFIG_FIELD(WIFI_BT)); } |