ASoC: Intel: sof_rt5682: add RPL support for MAX98357A speaker

Adding support back to RPL devices that lost audio after the RPL/ADL split. The hardware configuration is: SSP0: 10EC5682/RTL5682 codec SSP2: MAX98357A amplifier Signed-off-by: Terry Cheong <[email protected]>
thesofproject · Jun 27, 2023 · 8101278 · 8101278
1 parent 66d75fa
commit 8101278
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
@@ -1128,6 +1128,14 @@ static const struct platform_device_id board_ids[] = {
  SOF_BT_OFFLOAD_SSP(2) |
  SOF_SSP_BT_OFFLOAD_PRESENT),
  },
+ {
+ .name = "rpl_mx98357_rt5682",
+ .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
+ SOF_RT5682_SSP_CODEC(0) |
+ SOF_SPEAKER_AMP_PRESENT |
+ SOF_RT5682_SSP_AMP(2) |
+ SOF_RT5682_NUM_HDMIDEV(4)),
+ },
  {
  .name = "rpl_mx98360_rt5682",
  .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

diff --git a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
@@ -322,6 +322,11 @@ static const struct snd_soc_acpi_codecs rpl_rt5682_hp = {
  .codecs = {"10EC5682", "RTL5682"},
 };
 
+static const struct snd_soc_acpi_codecs rpl_max98357a_amp = {
+ .num_codecs = 1,
+ .codecs = {"MX98357A"}
+};
+
 static const struct snd_soc_acpi_codecs rpl_max98360a_amp = {
  .num_codecs = 1,
  .codecs = {"MX98360A"},
@@ -338,6 +343,13 @@ static const struct snd_soc_acpi_codecs rpl_rt1019p_amp = {
 };
 
 struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = {
+ {
+ .comp_ids = &rpl_rt5682_hp,
+ .drv_name = "rpl_mx98357_rt5682",
+ .machine_quirk = snd_soc_acpi_codec_list,
+ .quirk_data = &rpl_max98357a_amp,
+ .sof_tplg_filename = "sof-rpl-max98357a-rt5682.tplg",
+ },
  {
  .comp_ids = &rpl_rt5682_hp,
  .drv_name = "rpl_mx98360_rt5682",