diff options
| author | Cliff Huang <cliff.huang@intel.com> | 2021-02-10 17:41:41 -0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2021-03-15 06:24:48 +0000 |
| commit | bc1941f17860a53ba24774a0d58e0d78f040cf30 (patch) | |
| tree | 202ddd08e44afadff24bb1235c64ebc1b285c876 /src/soc | |
| parent | b34be4d4bb248c5b3c1addeb3d3832d64f1bc7e8 (diff) | |
soc/intel/alderlake: Add CNVi Bluetooth flag at devicetree entry
This change adds the corresponding CNVi BT Core enabling flag.
TEST: BT is checked using 'lsusb -d 8087:0026' from OS.
Change-Id: Iecc10c8946a450350adb34b984cf48ad988097ca
Signed-off-by: Cliff Huang <cliff.huang@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51350
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/intel/alderlake/chip.h | 3 | ||||
| -rw-r--r-- | src/soc/intel/alderlake/fsp_params.c | 11 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/soc/intel/alderlake/chip.h b/src/soc/intel/alderlake/chip.h index fa9fce2998..e1ac015e96 100644 --- a/src/soc/intel/alderlake/chip.h +++ b/src/soc/intel/alderlake/chip.h @@ -206,6 +206,9 @@ struct soc_intel_alderlake_config { /* Enable Pch iSCLK */ uint8_t pch_isclk; + /* CNVi BT Core Enable/Disable */ + bool CnviBtCore; + /* CNVi BT Audio Offload: Enable/Disable BT Audio Offload. */ bool CnviBtAudioOffload; diff --git a/src/soc/intel/alderlake/fsp_params.c b/src/soc/intel/alderlake/fsp_params.c index fcfad984db..19afbc4eaa 100644 --- a/src/soc/intel/alderlake/fsp_params.c +++ b/src/soc/intel/alderlake/fsp_params.c @@ -247,13 +247,12 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd) /* CNVi */ dev = pcidev_path_on_root(PCH_DEVFN_CNVI_WIFI); params->CnviMode = is_dev_enabled(dev); - - /* CNVi BT Core */ - dev = pcidev_path_on_root(PCH_DEVFN_CNVI_BT); - params->CnviBtCore = is_dev_enabled(dev); - - /* CNVi BT Audio Offload */ + params->CnviBtCore = config->CnviBtCore; params->CnviBtAudioOffload = config->CnviBtAudioOffload; + /* Assert if CNVi BT is enabled without CNVi being enabled. */ + assert(params->CnviMode || !params->CnviBtCore); + /* Assert if CNVi BT offload is enabled without CNVi BT being enabled. */ + assert(params->CnviBtCore || !params->CnviBtAudioOffload); /* VMD */ dev = pcidev_path_on_root(SA_DEVFN_VMD); |