summaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/common/soc-acpi-intel-cml-match.c
diff options
context:
space:
mode:
authorBrent Lu <brent.lu@intel.com>2020-07-01 17:36:51 +0800
committerMark Brown <broonie@kernel.org>2020-07-01 19:28:28 +0100
commite1435a1feb18e198155d16d3d6b500d46e0625c0 (patch)
treecb101e282b82affea00be62194abb606f3152557 /sound/soc/intel/common/soc-acpi-intel-cml-match.c
parenta2b782d59c57cb6f673dbb4804ffc500336d7a54 (diff)
downloadlinux-stable-e1435a1feb18e198155d16d3d6b500d46e0625c0.tar.gz
linux-stable-e1435a1feb18e198155d16d3d6b500d46e0625c0.tar.bz2
linux-stable-e1435a1feb18e198155d16d3d6b500d46e0625c0.zip
ASoC: Intel: bxt-da7219-max98357a: support MAX98390 speaker amp
Support MAX98390 speaker amplifier on cometlake platform. Driver now detects amplifier type in the probe function and installs corresponding controls and DAPM widgets/routes in the late_probe function. Signed-off-by: Brent Lu <brent.lu@intel.com> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/1593596211-28344-1-git-send-email-brent.lu@intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/common/soc-acpi-intel-cml-match.c')
-rw-r--r--sound/soc/intel/common/soc-acpi-intel-cml-match.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/sound/soc/intel/common/soc-acpi-intel-cml-match.c b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
index cdea0c09fe0a..dee1f0fa998b 100644
--- a/sound/soc/intel/common/soc-acpi-intel-cml-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
@@ -19,6 +19,11 @@ static struct snd_soc_acpi_codecs max98357a_spk_codecs = {
.codecs = {"MX98357A"}
};
+static struct snd_soc_acpi_codecs max98390_spk_codecs = {
+ .num_codecs = 1,
+ .codecs = {"MX98390"}
+};
+
/*
* The order of the three entries with .id = "10EC5682" matters
* here, because DSDT tables expose an ACPI HID for the MAX98357A
@@ -55,6 +60,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_machines[] = {
.sof_fw_filename = "sof-cml.ri",
.sof_tplg_filename = "sof-cml-da7219-max98357a.tplg",
},
+ {
+ .id = "DLGS7219",
+ .drv_name = "cml_da7219_max98357a",
+ .machine_quirk = snd_soc_acpi_codec_list,
+ .quirk_data = &max98390_spk_codecs,
+ .sof_fw_filename = "sof-cml.ri",
+ .sof_tplg_filename = "sof-cml-da7219-max98357a.tplg",
+ },
{},
};
EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_cml_machines);