summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@gmail.com>2023-05-15 10:47:15 -0500
committerFelix Held <felix-coreboot@felixheld.de>2023-05-17 11:21:09 +0000
commit1be9f3502c26c07a8da3c77cd8e172b4c87705fc (patch)
treed932c34ec55ec5d8d9a663bec9e7d1fcc1625777 /src
parente29b770d8357c41e7e130710f8418259174e2142 (diff)
mb/google/volteer: Use FW_CONFIG to determine correct SOF audio profile
Use AUDIO PROBE to determine speaker amp config, set SOF driver profile accordingly. TEST=build/boot Win11 on Delbin and Drobit, verify correct audio profile selected, drivers loaded and functional. Change-Id: I13d787cb5ccb74d2774151ccd5deeb45b3364319 Signed-off-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/75232 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/google/volteer/variants/baseboard/devicetree.cb29
-rw-r--r--src/mainboard/google/volteer/variants/lindar/overridetree.cb6
2 files changed, 28 insertions, 7 deletions
diff --git a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
index acb2e3ca79..4af59e6ff1 100644
--- a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
@@ -526,7 +526,34 @@ chip soc/intel/tigerlake
register "spkr_tplg" = "max98373"
register "jack_tplg" = "rt5682"
register "mic_tplg" = "_2ch_pdm0"
- device generic 0 on end
+ device generic 0 on
+ probe AUDIO MAX98373_ALC5682I_I2S
+ probe AUDIO MAX98373_ALC5682_SNDW
+ end
+ end
+ chip drivers/sof
+ register "spkr_tplg" = "max98373_ssp2"
+ register "jack_tplg" = "rt5682"
+ register "mic_tplg" = "_2ch_pdm0"
+ device generic 0 on
+ probe AUDIO MAX98373_ALC5682I_I2S_UP4
+ end
+ end
+ chip drivers/sof
+ register "spkr_tplg" = "max98360a"
+ register "jack_tplg" = "rt5682"
+ register "mic_tplg" = "_2ch_pdm0"
+ device generic 0 on
+ probe AUDIO MAX98360_ALC5682I_I2S
+ end
+ end
+ chip drivers/sof
+ register "spkr_tplg" = "rt1011"
+ register "jack_tplg" = "rt5682"
+ register "mic_tplg" = "_2ch_pdm0"
+ device generic 0 on
+ probe AUDIO RT1011_ALC5682I_I2S
+ end
end
end
end
diff --git a/src/mainboard/google/volteer/variants/lindar/overridetree.cb b/src/mainboard/google/volteer/variants/lindar/overridetree.cb
index e543b9fd63..b74bb238cd 100644
--- a/src/mainboard/google/volteer/variants/lindar/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/lindar/overridetree.cb
@@ -276,12 +276,6 @@ chip soc/intel/tigerlake
probe AUDIO MAX98373_ALC5682I_I2S_UP4
probe AUDIO MAX98360_ALC5682I_I2S
probe AUDIO RT1011_ALC5682I_I2S
- chip drivers/sof
- register "spkr_tplg" = "rt1011"
- register "jack_tplg" = "rt5682"
- register "mic_tplg" = "_2ch_pdm0"
- device generic 0 on end
- end
end
device ref pcie_rp9 on
chip soc/intel/common/block/pcie/rtd3