Unverified Commit 26d9726f authored by Terry Cheong's avatar Terry Cheong Committed by Mark Brown
Browse files

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

Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarTerry Cheong <htcheong@chromium.org>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20230731214257.444605-3-pierre-louis.bossart@linux.intel.com


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

sound/soc/intel/boards/sof_rt5682.c

+8 −0
Original line number Diff line number Diff line
@@ -1163,6 +1163,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 |

sound/soc/intel/common/soc-acpi-intel-rpl-match.c

+12 −0
Original line number Diff line number Diff line
@@ -331,6 +331,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"},
@@ -347,6 +352,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",