tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>
Link: https://lore.kernel.org/r/20230616063617.25900-2-mac.chiang@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Mac Chiang and committed by
Mark Brown b20c8137 1f583cbd

+35
+23
sound/soc/intel/boards/sof_rt5682.c
··· 243 243 .callback = sof_rt5682_quirk_cb, 244 244 .matches = { 245 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 + }, 256 + { 257 + .callback = sof_rt5682_quirk_cb, 258 + .matches = { 259 + DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Rex"), 246 260 }, 247 261 .driver_data = (void *)(SOF_RT5682_MCLK_EN | 248 262 SOF_RT5682_SSP_CODEC(2) | ··· 1168 1154 SOF_MAX98360A_SPEAKER_AMP_PRESENT | 1169 1155 SOF_RT5682_SSP_AMP(1) | 1170 1156 SOF_RT5682_NUM_HDMIDEV(4)), 1157 + }, 1158 + { 1159 + .name = "mtl_rt1019_rt5682", 1160 + .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | 1161 + SOF_RT5682_SSP_CODEC(2) | 1162 + SOF_SPEAKER_AMP_PRESENT | 1163 + SOF_RT1019_SPEAKER_AMP_PRESENT | 1164 + SOF_RT5682_SSP_AMP(0) | 1165 + SOF_RT5682_NUM_HDMIDEV(3)), 1171 1166 }, 1172 1167 { } 1173 1168 };
+12
sound/soc/intel/common/soc-acpi-intel-mtl-match.c
··· 20 20 .codecs = {"MX98360A"} 21 21 }; 22 22 23 + static const struct snd_soc_acpi_codecs mtl_rt1019p_amp = { 24 + .num_codecs = 1, 25 + .codecs = {"RTL1019"} 26 + }; 27 + 23 28 static const struct snd_soc_acpi_codecs mtl_rt5682_rt5682s_hp = { 24 29 .num_codecs = 2, 25 30 .codecs = {"10EC5682", "RTL5682"}, ··· 44 39 .machine_quirk = snd_soc_acpi_codec_list, 45 40 .quirk_data = &mtl_max98360a_amp, 46 41 .sof_tplg_filename = "sof-mtl-max98360a-rt5682.tplg", 42 + }, 43 + { 44 + .comp_ids = &mtl_rt5682_rt5682s_hp, 45 + .drv_name = "mtl_rt1019_rt5682", 46 + .machine_quirk = snd_soc_acpi_codec_list, 47 + .quirk_data = &mtl_rt1019p_amp, 48 + .sof_tplg_filename = "sof-mtl-rt1019-rt5682.tplg", 47 49 }, 48 50 {}, 49 51 };