diff options
| author | Brent Lu <brent.lu@intel.com> | 2024-03-27 11:24:06 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-03-28 13:58:24 +0000 |
| commit | ae33c9134d6e1a88c2e49422aee1474c03a53233 (patch) | |
| tree | 2a88b31c7e9208e35a8ecadae3242871f44f3551 | |
| parent | 2872f3b5df54ac14adc5ea62241312d66bd001ba (diff) | |
ASoC: Intel: sof_cs42l42: mach cleanup for adl boards
Add a common entry in enumeration table for all cs42l42 boards
with/without speaker amplifier. All other adl_cs42l42_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://msgid.link/r/20240327162408.63953-17-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/intel/common/soc-acpi-intel-adl-match.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c index 7977a6fb9a5c..1ea2d9c582ee 100644 --- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c @@ -496,13 +496,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { .sof_tplg_filename = "sof-adl-rt5682-ssp1-hdmi-ssp02.tplg", }, { - .id = "10134242", - .drv_name = "adl_cs42l42_def", - .machine_quirk = snd_soc_acpi_codec_list, - .quirk_data = &adl_max98360a_amp, - .sof_tplg_filename = "sof-adl-max98360a-cs42l42.tplg", - }, - { .comp_ids = &essx_83x6, .drv_name = "adl_es83x6_c1_h02", .machine_quirk = snd_soc_acpi_codec_list, @@ -528,6 +521,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { * tplg name and machine driver will detect the amp type */ { + .id = CS42L42_ACPI_HID, + .drv_name = "adl_cs42l42_def", + .sof_tplg_filename = "sof-adl", /* the tplg suffix is added at run time */ + .tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_AMP_NAME | + SND_SOC_ACPI_TPLG_INTEL_CODEC_NAME, + }, + { .id = NAU8825_ACPI_HID, .drv_name = "adl_nau8825_def", .sof_tplg_filename = "sof-adl", /* the tplg suffix is added at run time */ |