On 3/24/22 03:47, Ajye Huang wrote:

Follow Intel's design to replace max98360a amp SSP2 reather than SSP1 by judging DMI_OEM_STRING in sof_rt5682_quirk_table struct. And reusing max98357's topology since DAI setting could be leveraged.

Signed-off-by: Ajye Huang ajye_huang@compal.corp-partner.google.com

Acked-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com

---

sound/soc/intel/boards/sof_rt5682.c | 13 +++++++++++++ sound/soc/sof/sof-pci-dev.c | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index ebec4d15edaa..7126fcb63d90 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -212,6 +212,19 @@ static const struct dmi_system_id sof_rt5682_quirk_table[] = { SOF_SSP_BT_OFFLOAD_PRESENT),

},

• {

• .callback = sof_rt5682_quirk_cb,
  

• .matches = {
  

• 	DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Brya"),
  

• 	DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98360_ALC5682I_I2S_AMP_SSP2"),
  

• },
  

• .driver_data = (void *)(SOF_RT5682_MCLK_EN |
  

• 			SOF_RT5682_SSP_CODEC(0) |
  

• 			SOF_SPEAKER_AMP_PRESENT |
  

• 			SOF_MAX98360A_SPEAKER_AMP_PRESENT |
  

• 			SOF_RT5682_SSP_AMP(2) |
  

• 			SOF_RT5682_NUM_HDMIDEV(4)),
  

• }, {} };

diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c index 4c9596742844..12f5cff22448 100644 --- a/sound/soc/sof/sof-pci-dev.c +++ b/sound/soc/sof/sof-pci-dev.c @@ -83,7 +83,14 @@ static const struct dmi_system_id sof_tplg_table[] = { }, .driver_data = "sof-adl-max98357a-rt5682-2way.tplg", },

• {

• .callback = sof_tplg_cb,
  

• .matches = {
  

• 	DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Brya"),
  

• 	DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98360_ALC5682I_I2S_AMP_SSP2"),
  

• },
  

• .driver_data = "sof-adl-max98357a-rt5682.tplg",
  

• }, {} };