diff options
| author | Rui Zhou <zhourui@huaqin.corp-partner.google.com> | 2024-11-05 16:19:05 +0800 |
|---|---|---|
| committer | Subrata Banik <subratabanik@google.com> | 2024-11-07 04:15:20 +0000 |
| commit | e019a41d8a790568d98f04a162e2a5d9ceb57225 (patch) | |
| tree | 6aa88d7890d2fbf725ff19de83e42343547ebceb /src/mainboard/google/brya/variants/rull/variant.c | |
| parent | 4cd22efff834cf09a8a630ef527aad6acfea3a43 (diff) | |
mb/google/nissa/var/rull: Change padbased_override to rtd3 of wifi
The previous method made cnvi wifi6 configuration cumbersome
and unusable. And delete unused pins. We abandoned the
fw_config judgment method and changed to the better rtd3.
BUG=b:374629673
BRANCH=None
TEST=1. emerge-nissa coreboot chromeos-bootimage
2. wifi7&wifi6 function is normal
Change-Id: Ia95dc9f6b707db63840de9b15b38bdaea48ea192
Signed-off-by: Rui Zhou <zhourui@huaqin.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/85000
Reviewed-by: Subrata Banik <subratabanik@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Jayvik Desai <jayvik@google.com>
Diffstat (limited to 'src/mainboard/google/brya/variants/rull/variant.c')
| -rw-r--r-- | src/mainboard/google/brya/variants/rull/variant.c | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/src/mainboard/google/brya/variants/rull/variant.c b/src/mainboard/google/brya/variants/rull/variant.c index a2fffb4ba3..8bb7fac97f 100644 --- a/src/mainboard/google/brya/variants/rull/variant.c +++ b/src/mainboard/google/brya/variants/rull/variant.c @@ -16,29 +16,12 @@ const char *get_wifi_sar_cbfs_filename(void) return get_wifi_sar_fw_config_filename(FW_CONFIG_FIELD(WIFI)); } -static const struct pad_config wifi_pcie_enable_pad[] = { - /* H20 : IMGCLKOUT1 ==> WLAN_PERST_L */ - PAD_CFG_GPO(GPP_H20, 1, DEEP), - /* B11 : NC ==> EN_PP3300_WLAN_X*/ - PAD_CFG_GPO(GPP_B11, 1, DEEP), -}; - void variant_update_soc_chip_config(struct soc_intel_alderlake_config *config) { - if (!fw_config_probe(FW_CONFIG(WIFI, WIFI_CNVI_WIFI6E)) || fw_config_is_provisioned()) { - printk(BIOS_INFO, "CNVi bluetooth disabled by fw_config\n"); - config->cnvi_bt_core = false; - printk(BIOS_INFO, "CNVi bluetooth audio offload disabled by fw_config\n"); - config->cnvi_bt_audio_offload = false; - } -} - -void fw_config_gpio_padbased_override(struct pad_config *padbased_table) -{ - if (fw_config_probe(FW_CONFIG(WIFI, WIFI_CNVI_WIFI6E)) || !fw_config_is_provisioned()) { - printk(BIOS_INFO, "Enable PCie based Wifi GPIO pins.\n"); - gpio_padbased_override(padbased_table, wifi_pcie_enable_pad, - ARRAY_SIZE(wifi_pcie_enable_pad)); + if (!fw_config_is_provisioned() || fw_config_probe(FW_CONFIG(WIFI, WIFI_CNVI_WIFI6E))) { + printk(BIOS_INFO, "CNVi bluetooth enabled by fw_config\n"); + config->cnvi_bt_core = true; + config->cnvi_bt_audio_offload = true; } } |