From ddfe71953841a950a63fd1aa22e25624812c7a28 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Fri, 8 Sep 2023 21:16:57 -0500 Subject: [PATCH] mb/google/dedede: Fix SOF config for unprovisioned audio amp Dedede boards which select AUDIO_AMP_UNPROVISIONED via fw_config use rt1015 for the speaker topology, not max98360a. TEST=build/boot Win11 on google/magpie, verify correct audio profile selected. Change-Id: I5b75bd8fd37d2837de3c5bd25a02411a6982103b Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/77741 Tested-by: build bot (Jenkins) Reviewed-by: Sean Rhodes --- .../google/dedede/variants/baseboard/devicetree.cb | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/mainboard/google/dedede/variants/baseboard/devicetree.cb b/src/mainboard/google/dedede/variants/baseboard/devicetree.cb index f2aced26a0..2631b616ce 100644 --- a/src/mainboard/google/dedede/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/dedede/variants/baseboard/devicetree.cb @@ -421,6 +421,7 @@ chip soc/intel/jasperlake device generic 0 on probe AUDIO_AMP RT1015_I2C probe AUDIO_AMP RT1015P_AUTO + probe AUDIO_AMP UNPROVISIONED end end chip drivers/sof @@ -431,14 +432,6 @@ chip soc/intel/jasperlake probe AUDIO_AMP MAX98360 end end - chip drivers/sof - register "spkr_tplg" = "max98357a" - register "jack_tplg" = "rt5682" - register "mic_tplg" = "_2ch_pdm0" - device generic 0 on - probe AUDIO_AMP UNPROVISIONED - end - end end # Intel HDA/cAVS device pci 1f.4 off end # SMBus device pci 1f.5 on end # PCH SPI