diff options
| author | Mark Brown <broonie@kernel.org> | 2023-08-15 21:22:03 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-08-15 21:22:03 +0300 |
| commit | 63e041027669473ab7474c195771bc86af9685a6 (patch) | |
| tree | 13b614beeb358ab10e8d1c1ccb8a18c04f577f09 /sound/soc/intel/common/soc-acpi-intel-rpl-match.c | |
| parent | a942409c97ce12c2a4811b538568b1342d91e56c (diff) | |
| parent | f7555da71ef6eb9d289173d94ec2cc9d15061f33 (diff) | |
| download | linux-63e041027669473ab7474c195771bc86af9685a6.tar.xz | |
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.
Diffstat (limited to 'sound/soc/intel/common/soc-acpi-intel-rpl-match.c')
| -rw-r--r-- | sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c index 1dd699181765..122673c1dae2 100644 --- a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c @@ -331,6 +331,11 @@ static const struct snd_soc_acpi_codecs rpl_rt5682_hp = { .codecs = {"10EC5682", "RTL5682"}, }; +static const struct snd_soc_acpi_codecs rpl_essx_83x6 = { + .num_codecs = 3, + .codecs = { "ESSX8316", "ESSX8326", "ESSX8336"}, +}; + static const struct snd_soc_acpi_codecs rpl_max98357a_amp = { .num_codecs = 1, .codecs = {"MX98357A"} @@ -346,9 +351,9 @@ static const struct snd_soc_acpi_codecs rpl_max98373_amp = { .codecs = {"MX98373"} }; -static const struct snd_soc_acpi_codecs rpl_rt1019p_amp = { +static const struct snd_soc_acpi_codecs rpl_lt6911_hdmi = { .num_codecs = 1, - .codecs = {"RTL1019"} + .codecs = {"INTC10B0"} }; static const struct snd_soc_acpi_codecs rpl_nau8318_amp = { @@ -356,6 +361,11 @@ static const struct snd_soc_acpi_codecs rpl_nau8318_amp = { .codecs = {"NVTN2012"} }; +static const struct snd_soc_acpi_codecs rpl_rt1019p_amp = { + .num_codecs = 1, + .codecs = {"RTL1019"} +}; + struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = { { .comp_ids = &rpl_rt5682_hp, @@ -392,6 +402,26 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = { .quirk_data = &rpl_rt1019p_amp, .sof_tplg_filename = "sof-rpl-rt1019-rt5682.tplg", }, + { + .comp_ids = &rpl_essx_83x6, + .drv_name = "rpl_es83x6_c1_h02", + .machine_quirk = snd_soc_acpi_codec_list, + .quirk_data = &rpl_lt6911_hdmi, + .sof_tplg_filename = "sof-rpl-es83x6-ssp1-hdmi-ssp02.tplg", + }, + { + .comp_ids = &rpl_essx_83x6, + .drv_name = "sof-essx8336", + .sof_tplg_filename = "sof-rpl-es83x6", /* the tplg suffix is added at run time */ + .tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_SSP_NUMBER | + SND_SOC_ACPI_TPLG_INTEL_SSP_MSB | + SND_SOC_ACPI_TPLG_INTEL_DMIC_NUMBER, + }, + { + .id = "INTC10B0", + .drv_name = "rpl_lt6911_hdmi_ssp", + .sof_tplg_filename = "sof-rpl-nocodec-hdmi-ssp02.tplg" + }, {}, }; EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_rpl_machines); |