Unverified Commit a7fe7e24 authored by Curtis Malainey's avatar Curtis Malainey Committed by Mark Brown
Browse files

ASoC: Intel: Add rpl_mx98360_rt5682 driver 



Boards were using this in older kernels before adl and rpl ids were
split. Add this back to maintain support.

Signed-off-by: default avatarCurtis Malainey <cujomalainey@chromium.org>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20230406153703.17194-1-pierre-louis.bossart@linux.intel.com


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

sound/soc/intel/boards/sof_rt5682.c

+11 −0
Original line number Diff line number Diff line
@@ -1116,6 +1116,17 @@ static const struct platform_device_id board_ids[] = { 
					SOF_BT_OFFLOAD_SSP(2) |

					SOF_SSP_BT_OFFLOAD_PRESENT),

	},

	{

		.name = "rpl_mx98360_rt5682",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

					SOF_RT5682_SSP_CODEC(0) |

					SOF_SPEAKER_AMP_PRESENT |

					SOF_MAX98360A_SPEAKER_AMP_PRESENT |

					SOF_RT5682_SSP_AMP(1) |

					SOF_RT5682_NUM_HDMIDEV(4) |

					SOF_BT_OFFLOAD_SSP(2) |

					SOF_SSP_BT_OFFLOAD_PRESENT),

	},

	{

		.name = "mtl_mx98357_rt5682",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

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

+17 −0
Original line number Diff line number Diff line
@@ -284,7 +284,24 @@ static const struct snd_soc_acpi_link_adr rpl_sdw_rt1316_link12_rt714_link0[] = 
	{}

};



static const struct snd_soc_acpi_codecs rpl_rt5682_hp = {

	.num_codecs = 2,

	.codecs = {"10EC5682", "RTL5682"},

};



static const struct snd_soc_acpi_codecs rpl_max98360a_amp = {

	.num_codecs = 1,

	.codecs = {"MX98360A"},

};



struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = {

	{

		.comp_ids = &rpl_rt5682_hp,

		.drv_name = "rpl_mx98360_rt5682",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &rpl_max98360a_amp,

		.sof_tplg_filename = "sof-rpl-max98360a-rt5682.tplg",

	},

	{},

};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_rpl_machines);