Unverified Commit 5dc51e50 authored by Terry Cheong's avatar Terry Cheong Committed by Mark Brown
Browse files

ASoC: Intel: Add rpl_rt1019_rt5682 driver 



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

Reviewed-by: default avatarCurtis Malainey <cujomalainey@chromium.org>
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/20230602202225.249209-23-pierre-louis.bossart@linux.intel.com


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

sound/soc/intel/boards/sof_rt5682.c

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

					SOF_SSP_BT_OFFLOAD_PRESENT),

	},

	{

		.name = "rpl_rt1019_rt5682",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

					SOF_RT5682_SSP_CODEC(0) |

					SOF_SPEAKER_AMP_PRESENT |

					SOF_RT1019_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

+12 −0
Original line number Diff line number Diff line
@@ -332,6 +332,11 @@ static const struct snd_soc_acpi_codecs rpl_max98373_amp = { 
	.codecs = {"MX98373"}

};



static const struct snd_soc_acpi_codecs rpl_rt1019p_amp = {

	.num_codecs = 1,

	.codecs = {"RTL1019"}

};



struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = {

	{

		.comp_ids = &rpl_rt5682_hp,
@@ -347,6 +352,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = { 
		.quirk_data = &rpl_max98373_amp,

		.sof_tplg_filename = "sof-rpl-max98373-nau8825.tplg",

	},

	{

		.comp_ids = &rpl_rt5682_hp,

		.drv_name = "rpl_rt1019_rt5682",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &rpl_rt1019p_amp,

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

	},

	{},

};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_rpl_machines);