diff options
| author |  Mark Brown <broonie@kernel.org>
| 2022-11-16 13:12:20 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org>
| 2022-11-16 13:12:20 +0000 |
| commit | f56814af1c1cf416f8df739c3959617c9624db2f (patch) | |
| tree | 6fcda54cdd059c1c11ecbf20737aa2861d8f2c84 /sound/soc/intel/common | |
| parent | ASoC: rt1318: Add RT1318 SDCA vendor-specific driver (diff) | |
| parent | ASoC: Intel: sof rt5682: remove the duplicate codes (diff) | |
| download | linux-f56814af1c1cf416f8df739c3959617c9624db2f.tar.gz linux-f56814af1c1cf416f8df739c3959617c9624db2f.tar.bz2 linux-f56814af1c1cf416f8df739c3959617c9624db2f.zip | |
Adds the combination of headset codec ALC5682I-VD + amp rt1019p
Merge series from Ajye Huang <ajye_huang@compal.corp-partner.google.com>:
v1:
- machine driver:
- Adds the combination of headset codec ALC5682I-VD + amp rt1019p.
- Remove the duplicate code in machine driver.
Ajye Huang (2):
ASoC: Intel: sof_rt5682: add support for ALC5682I-VD with amp rt1019p
ASoC: Intel: sof rt5682: remove the duplicate codes
sound/soc/intel/boards/sof_rt5682.c | 7 +------
sound/soc/intel/common/soc-acpi-intel-adl-match.c | 4 ++--
2 files changed, 3 insertions(+), 8 deletions(-)
--
2.25.1
Diffstat (limited to 'sound/soc/intel/common')
| -rw-r--r-- | sound/soc/intel/common/soc-acpi-intel-adl-match.c | 4 |
1 files changed, 2 insertions, 2 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 9990d5502d26..3ca0a96d94de 100644 --- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c @@ -489,8 +489,8 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { .sof_tplg_filename = "sof-adl-max98360a-nau8825.tplg", }, { - .id = "RTL5682", - .drv_name = "adl_rt1019_rt5682s", + .comp_ids = &adl_rt5682_rt5682s_hp, + .drv_name = "adl_rt1019_rt5682", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &adl_rt1019p_amp, .sof_tplg_filename = "sof-adl-rt1019-rt5682.tplg", |