diff options
| -rw-r--r-- | src/mainboard/google/volteer/mainboard.c | 14 | ||||
| -rw-r--r-- | src/mainboard/google/volteer/romstage.c | 12 | ||||
| -rw-r--r-- | src/mainboard/google/volteer/variants/baseboard/devicetree.cb | 8 |
3 files changed, 7 insertions, 27 deletions
diff --git a/src/mainboard/google/volteer/mainboard.c b/src/mainboard/google/volteer/mainboard.c index 1f20e18ec7..4d65245066 100644 --- a/src/mainboard/google/volteer/mainboard.c +++ b/src/mainboard/google/volteer/mainboard.c @@ -165,20 +165,6 @@ static void mainboard_chip_init(void *chip_info) } } -void mainboard_silicon_init_params(FSP_S_CONFIG *params) -{ - bool has_usb4; - - /* If device doesn't have USB4 hardware, disable tbt */ - has_usb4 = (fw_config_probe(FW_CONFIG(DB_USB, USB4_GEN2)) - || fw_config_probe(FW_CONFIG(DB_USB, USB4_GEN3))); - - if (!has_usb4) - memset(params->ITbtPcieRootPortEn, 0, - ARRAY_SIZE(params->ITbtPcieRootPortEn) - * sizeof(*params->ITbtPcieRootPortEn)); -} - struct chip_operations mainboard_ops = { .init = mainboard_chip_init, .enable_dev = mainboard_enable, diff --git a/src/mainboard/google/volteer/romstage.c b/src/mainboard/google/volteer/romstage.c index 315ec2004a..67d3489b03 100644 --- a/src/mainboard/google/volteer/romstage.c +++ b/src/mainboard/google/volteer/romstage.c @@ -22,17 +22,5 @@ void mainboard_memory_init_params(FSPM_UPD *mupd) }; bool half_populated = gpio_get(GPIO_MEM_CH_SEL); - /* Disable HDA device if no audio board is present. */ - if (fw_config_probe(FW_CONFIG(AUDIO, NONE))) - mem_cfg->PchHdaEnable = 0; - meminit_ddr(mem_cfg, board_cfg, &spd_info, half_populated); - - /* Disable TBT if no USB4 hardware */ - if (!(fw_config_probe(FW_CONFIG(DB_USB, USB4_GEN2)) || - fw_config_probe(FW_CONFIG(DB_USB, USB4_GEN3)))) { - mem_cfg->TcssDma0En = 0; - mem_cfg->TcssItbtPcie0En = 0; - mem_cfg->TcssItbtPcie1En = 0; - } } diff --git a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb index 30625ca020..01bbf1e06b 100644 --- a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb @@ -523,6 +523,12 @@ chip soc/intel/tigerlake device pnp 0c09.0 on end end end - device ref hda on end + device ref hda on + probe AUDIO MAX98357_ALC5682I_I2S + probe AUDIO MAX98373_ALC5682I_I2S + probe AUDIO MAX98373_ALC5682_SNDW + probe AUDIO MAX98373_ALC5682I_I2S_UP4 + probe AUDIO MAX98360_ALC5682I_I2S + end end end |