Unverified Commit fcd1e39c authored by Ajye Huang's avatar Ajye Huang Committed by Mark Brown
Browse files

ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp on SSP2 



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: default avatarAjye Huang <ajye_huang@compal.corp-partner.google.com>
Acked-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220324084708.2009375-1-ajye_huang@compal.corp-partner.google.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d00887c1

sound/soc/intel/boards/sof_rt5682.c

+13 −0
Original line number Diff line number Diff line
@@ -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)),

	},

	{}

};

sound/soc/sof/sof-pci-dev.c

+8 −1
Original line number Diff line number Diff line
@@ -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",

	},

	{}

};