summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2022-03-02 19:58:51 +0300
committerMark Brown <broonie@kernel.org>2022-03-02 19:58:51 +0300
commit227178d238b3ebdc2347045b52e2f2a8d4809a11 (patch)
treedd025f3234cfab824942d5fbb34a078eff725f3e /include
parentd5dd781bcc81aa31b62310927f25cfa2574450f1 (diff)
parentc4dcd7100c26881b1095d5b2651d61190fc5f247 (diff)
downloadlinux-227178d238b3ebdc2347045b52e2f2a8d4809a11.tar.xz
ASoC: Intel: machine driver updates for 5.18
Merge series from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>: Two cleanups to remove an unused filename and typos, and one addition of an ACPI matching table for a Dell SoundWire SKU without local microphones. The main change is the addition of a common 'sof-ssp-amp' machine driver for devices with amplifiers only (no headset codec) and different connections using I2S links (Bluetooth offload, HDMI receiver). It's likely that the amplifier will be swapped out by OEMs, this machine driver provides a relatively generic solution to avoid copy-paste of similar solutions.
Diffstat (limited to 'include')
-rw-r--r--include/sound/soc-acpi.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h
index ac0893df9c76..fdb536d699ff 100644
--- a/include/sound/soc-acpi.h
+++ b/include/sound/soc-acpi.h
@@ -142,7 +142,6 @@ struct snd_soc_acpi_link_adr {
* audio codecs whose presence if checked with ACPI
* @pdata: intended for platform data or machine specific-ops. This structure
* is not constant since this field may be updated at run-time
- * @sof_fw_filename: Sound Open Firmware file name, if enabled
* @sof_tplg_filename: Sound Open Firmware topology file name, if enabled
*/
/* Descriptor for SST ASoC machine driver */
@@ -158,7 +157,6 @@ struct snd_soc_acpi_mach {
const void *quirk_data;
void *pdata;
struct snd_soc_acpi_mach_params mach_params;
- const char *sof_fw_filename;
const char *sof_tplg_filename;
};