Skip to content

Commit 2776754

Browse files
macchianplbossart
authored andcommitted
ASoC: Intel: sof_rt5682: Add mtl support RT1019P speaker
This patch support below hardware configuration: SSP2: 10EC5682/RTL5682 codec SSP0: RTL1019 amplifier Signed-off-by: Mac Chiang <mac.chiang@intel.com> Signed-off-by: Rui Zhou <zhourui@huaqin.corp-partner.google.com>
1 parent 9fd7ca4 commit 2776754

File tree

2 files changed

+35
-0
lines changed

2 files changed

+35
-0
lines changed

sound/soc/intel/boards/sof_rt5682.c

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,20 @@ static const struct dmi_system_id sof_rt5682_quirk_table[] = {
239239
SOF_SSP_BT_OFFLOAD_PRESENT
240240
),
241241
},
242+
{
243+
.callback = sof_rt5682_quirk_cb,
244+
.matches = {
245+
DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Rex"),
246+
DMI_MATCH(DMI_OEM_STRING, "AUDIO-ALC1019_ALC5682I_I2S"),
247+
},
248+
.driver_data = (void *)(SOF_RT5682_MCLK_EN |
249+
SOF_RT5682_SSP_CODEC(2) |
250+
SOF_SPEAKER_AMP_PRESENT |
251+
SOF_RT1019_SPEAKER_AMP_PRESENT |
252+
SOF_RT5682_SSP_AMP(0) |
253+
SOF_RT5682_NUM_HDMIDEV(3)
254+
),
255+
},
242256
{
243257
.callback = sof_rt5682_quirk_cb,
244258
.matches = {
@@ -1155,6 +1169,15 @@ static const struct platform_device_id board_ids[] = {
11551169
SOF_RT5682_SSP_AMP(1) |
11561170
SOF_RT5682_NUM_HDMIDEV(4)),
11571171
},
1172+
{
1173+
.name = "mtl_rt1019_rt5682",
1174+
.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
1175+
SOF_RT5682_SSP_CODEC(2) |
1176+
SOF_SPEAKER_AMP_PRESENT |
1177+
SOF_RT1019_SPEAKER_AMP_PRESENT |
1178+
SOF_RT5682_SSP_AMP(0) |
1179+
SOF_RT5682_NUM_HDMIDEV(3)),
1180+
},
11581181
{ }
11591182
};
11601183
MODULE_DEVICE_TABLE(platform, board_ids);

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ static const struct snd_soc_acpi_codecs mtl_max98360a_amp = {
2020
.codecs = {"MX98360A"}
2121
};
2222

23+
static const struct snd_soc_acpi_codecs mtl_rt1019p_amp = {
24+
.num_codecs = 1,
25+
.codecs = {"RTL1019"}
26+
};
27+
2328
static const struct snd_soc_acpi_codecs mtl_rt5682_rt5682s_hp = {
2429
.num_codecs = 2,
2530
.codecs = {"10EC5682", "RTL5682"},
@@ -40,6 +45,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[] = {
4045
.quirk_data = &mtl_max98360a_amp,
4146
.sof_tplg_filename = "sof-mtl-max98360a-rt5682.tplg",
4247
},
48+
{
49+
.comp_ids = &mtl_rt5682_rt5682s_hp,
50+
.drv_name = "mtl_rt1019_rt5682",
51+
.machine_quirk = snd_soc_acpi_codec_list,
52+
.quirk_data = &mtl_rt1019p_amp,
53+
.sof_tplg_filename = "sof-mtl-rt1019-rt5682.tplg",
54+
},
4355
{},
4456
};
4557
EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_mtl_machines);

0 commit comments

Comments
 (0)