Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ASoC: Intel: RPL/MTL machine updates for 6.6
Merge series from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:
4 commits with the match tables for RaptorLake and MeteorLake devices.
+103
-2
+10
sound/soc/intel/boards/sof_es8336.c
+10
sound/soc/intel/boards/sof_es8336.c
···
798
798
SOF_ES8336_SPEAKERS_EN_GPIO1_QUIRK |
799
799
SOF_ES8336_JD_INVERTED),
800
800
},
801
+
{
802
+
.name = "rpl_es83x6_c1_h02",
803
+
.driver_data = (kernel_ulong_t)(SOF_ES8336_SSP_CODEC(1) |
804
+
SOF_NO_OF_HDMI_CAPTURE_SSP(2) |
805
+
SOF_HDMI_CAPTURE_1_SSP(0) |
806
+
SOF_HDMI_CAPTURE_2_SSP(2) |
807
+
SOF_SSP_HDMI_CAPTURE_PRESENT |
808
+
SOF_ES8336_SPEAKERS_EN_GPIO1_QUIRK |
809
+
SOF_ES8336_JD_INVERTED),
810
+
},
801
811
{ }
802
812
};
803
813
MODULE_DEVICE_TABLE(platform, board_ids);
+9
sound/soc/intel/boards/sof_ssp_amp.c
+9
sound/soc/intel/boards/sof_ssp_amp.c
···
472
472
SOF_NO_OF_HDMI_PLAYBACK(3) |
473
473
SOF_HDMI_PLAYBACK_PRESENT),
474
474
},
475
+
{
476
+
.name = "rpl_lt6911_hdmi_ssp",
477
+
.driver_data = (kernel_ulong_t)(SOF_NO_OF_HDMI_CAPTURE_SSP(2) |
478
+
SOF_HDMI_CAPTURE_1_SSP(0) |
479
+
SOF_HDMI_CAPTURE_2_SSP(2) |
480
+
SOF_SSP_HDMI_CAPTURE_PRESENT |
481
+
SOF_NO_OF_HDMI_PLAYBACK(3) |
482
+
SOF_HDMI_PLAYBACK_PRESENT),
483
+
},
475
484
{ }
476
485
};
477
486
MODULE_DEVICE_TABLE(platform, board_ids);
+52
sound/soc/intel/common/soc-acpi-intel-mtl-match.c
+52
sound/soc/intel/common/soc-acpi-intel-mtl-match.c
···
161
161
}
162
162
};
163
163
164
+
static const struct snd_soc_acpi_adr_device rt1318_1_group1_adr[] = {
165
+
{
166
+
.adr = 0x000130025D131801ull,
167
+
.num_endpoints = 1,
168
+
.endpoints = &spk_l_endpoint,
169
+
.name_prefix = "rt1318-1"
170
+
}
171
+
};
172
+
173
+
static const struct snd_soc_acpi_adr_device rt1318_2_group1_adr[] = {
174
+
{
175
+
.adr = 0x000232025D131801ull,
176
+
.num_endpoints = 1,
177
+
.endpoints = &spk_r_endpoint,
178
+
.name_prefix = "rt1318-2"
179
+
}
180
+
};
181
+
182
+
static const struct snd_soc_acpi_adr_device rt714_0_adr[] = {
183
+
{
184
+
.adr = 0x000030025D071401ull,
185
+
.num_endpoints = 1,
186
+
.endpoints = &single_endpoint,
187
+
.name_prefix = "rt714"
188
+
}
189
+
};
190
+
164
191
static const struct snd_soc_acpi_adr_device rt714_1_adr[] = {
165
192
{
166
193
.adr = 0x000130025D071401ull,
···
259
232
{}
260
233
};
261
234
235
+
static const struct snd_soc_acpi_link_adr mtl_sdw_rt1318_l12_rt714_l0[] = {
236
+
{
237
+
.mask = BIT(1),
238
+
.num_adr = ARRAY_SIZE(rt1318_1_group1_adr),
239
+
.adr_d = rt1318_1_group1_adr,
240
+
},
241
+
{
242
+
.mask = BIT(2),
243
+
.num_adr = ARRAY_SIZE(rt1318_2_group1_adr),
244
+
.adr_d = rt1318_2_group1_adr,
245
+
},
246
+
{
247
+
.mask = BIT(0),
248
+
.num_adr = ARRAY_SIZE(rt714_0_adr),
249
+
.adr_d = rt714_0_adr,
250
+
},
251
+
{}
252
+
};
253
+
262
254
static const struct snd_soc_acpi_adr_device mx8363_2_adr[] = {
263
255
{
264
256
.adr = 0x000230019F836300ull,
···
343
297
.links = mtl_712_only,
344
298
.drv_name = "sof_sdw",
345
299
.sof_tplg_filename = "sof-mtl-rt712-l0-rt1712-l3.tplg",
300
+
},
301
+
{
302
+
.link_mask = GENMASK(2, 0),
303
+
.links = mtl_sdw_rt1318_l12_rt714_l0,
304
+
.drv_name = "sof_sdw",
305
+
.sof_tplg_filename = "sof-mtl-rt1318-l12-rt714-l0.tplg"
346
306
},
347
307
{
348
308
.link_mask = GENMASK(3, 0),
+32
-2
sound/soc/intel/common/soc-acpi-intel-rpl-match.c
+32
-2
sound/soc/intel/common/soc-acpi-intel-rpl-match.c
···
331
331
.codecs = {"10EC5682", "RTL5682"},
332
332
};
333
333
334
+
static const struct snd_soc_acpi_codecs rpl_essx_83x6 = {
335
+
.num_codecs = 3,
336
+
.codecs = { "ESSX8316", "ESSX8326", "ESSX8336"},
337
+
};
338
+
334
339
static const struct snd_soc_acpi_codecs rpl_max98357a_amp = {
335
340
.num_codecs = 1,
336
341
.codecs = {"MX98357A"}
···
351
346
.codecs = {"MX98373"}
352
347
};
353
348
354
-
static const struct snd_soc_acpi_codecs rpl_rt1019p_amp = {
349
+
static const struct snd_soc_acpi_codecs rpl_lt6911_hdmi = {
355
350
.num_codecs = 1,
356
-
.codecs = {"RTL1019"}
351
+
.codecs = {"INTC10B0"}
357
352
};
358
353
359
354
static const struct snd_soc_acpi_codecs rpl_nau8318_amp = {
360
355
.num_codecs = 1,
361
356
.codecs = {"NVTN2012"}
357
+
};
358
+
359
+
static const struct snd_soc_acpi_codecs rpl_rt1019p_amp = {
360
+
.num_codecs = 1,
361
+
.codecs = {"RTL1019"}
362
362
};
363
363
364
364
struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = {
···
401
391
.machine_quirk = snd_soc_acpi_codec_list,
402
392
.quirk_data = &rpl_rt1019p_amp,
403
393
.sof_tplg_filename = "sof-rpl-rt1019-rt5682.tplg",
394
+
},
395
+
{
396
+
.comp_ids = &rpl_essx_83x6,
397
+
.drv_name = "rpl_es83x6_c1_h02",
398
+
.machine_quirk = snd_soc_acpi_codec_list,
399
+
.quirk_data = &rpl_lt6911_hdmi,
400
+
.sof_tplg_filename = "sof-rpl-es83x6-ssp1-hdmi-ssp02.tplg",
401
+
},
402
+
{
403
+
.comp_ids = &rpl_essx_83x6,
404
+
.drv_name = "sof-essx8336",
405
+
.sof_tplg_filename = "sof-rpl-es83x6", /* the tplg suffix is added at run time */
406
+
.tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_SSP_NUMBER |
407
+
SND_SOC_ACPI_TPLG_INTEL_SSP_MSB |
408
+
SND_SOC_ACPI_TPLG_INTEL_DMIC_NUMBER,
409
+
},
410
+
{
411
+
.id = "INTC10B0",
412
+
.drv_name = "rpl_lt6911_hdmi_ssp",
413
+
.sof_tplg_filename = "sof-rpl-nocodec-hdmi-ssp02.tplg"
404
414
},
405
415
{},
406
416
};