Tim Wawrzynczak has uploaded this change for review.
mb/google/volteer: Clean up romstage.c
Move the manual calls to fw_config_probe() into the devicetree; the
AUDIO probe is trivial, and the TCSS devices (DMA0, iTBT RP0 & RP1) are
already guarded with probe statements in the baseboard devicetree, so
the code in romstage.c was redundant.
Change-Id: I1d067ff3d181b152c784634ff99202bb2b9202f7
Signed-off-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
---
M src/mainboard/google/volteer/romstage.c
M src/mainboard/google/volteer/variants/baseboard/devicetree.cb
2 files changed, 7 insertions(+), 13 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/12/48512/1
diff --git a/src/mainboard/google/volteer/romstage.c b/src/mainboard/google/volteer/romstage.c
index 315ec20..67d3489 100644
--- a/src/mainboard/google/volteer/romstage.c
+++ b/src/mainboard/google/volteer/romstage.c
@@ -22,17 +22,5 @@
};
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 7964885..c61b003 100644
--- a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
@@ -501,6 +501,12 @@
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
To view, visit change 48512. To unsubscribe, or for help writing mail filters, visit settings.