Skip to content

Commit c3d1818

Browse files
brentlubroonie
authored andcommitted
ASoC: Intel: sof_da7219: mach cleanup for rpl boards
Add a common entry in enumeration table for all da7219 boards with/without speaker amplifier. All other rpl_da7219_def entries become redundant so get removed. Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Signed-off-by: Brent Lu <brent.lu@intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20240411220347.131267-8-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 36a6210 commit c3d1818

1 file changed

Lines changed: 7 additions & 12 deletions

File tree

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

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -361,11 +361,6 @@ static const struct snd_soc_acpi_codecs rpl_max98357a_amp = {
361361
.codecs = {"MX98357A"}
362362
};
363363

364-
static const struct snd_soc_acpi_codecs rpl_max98360a_amp = {
365-
.num_codecs = 1,
366-
.codecs = {"MX98360A"},
367-
};
368-
369364
static const struct snd_soc_acpi_codecs rpl_lt6911_hdmi = {
370365
.num_codecs = 1,
371366
.codecs = {"INTC10B0"}
@@ -411,6 +406,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = {
411406
.tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_AMP_NAME |
412407
SND_SOC_ACPI_TPLG_INTEL_CODEC_NAME,
413408
},
409+
{
410+
.id = DA7219_ACPI_HID,
411+
.drv_name = "rpl_da7219_def",
412+
.sof_tplg_filename = "sof-rpl", /* the tplg suffix is added at run time */
413+
.tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_AMP_NAME |
414+
SND_SOC_ACPI_TPLG_INTEL_CODEC_NAME,
415+
},
414416
{
415417
.id = NAU8825_ACPI_HID,
416418
.drv_name = "rpl_nau8825_def",
@@ -438,13 +440,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = {
438440
.drv_name = "rpl_lt6911_hdmi_ssp",
439441
.sof_tplg_filename = "sof-rpl-nocodec-hdmi-ssp02.tplg"
440442
},
441-
{
442-
.id = "DLGS7219",
443-
.drv_name = "rpl_da7219_def",
444-
.machine_quirk = snd_soc_acpi_codec_list,
445-
.quirk_data = &rpl_max98360a_amp,
446-
.sof_tplg_filename = "sof-rpl-max98360a-da7219.tplg",
447-
},
448443
{},
449444
};
450445
EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_rpl_machines);

0 commit comments

Comments
 (0)