Changeset 777 for GPL/trunk/alsa-kernel/include/sound/soc-acpi.h

Timestamp:

Apr 21, 2025, 7:17:25 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge from uniaud32-exp branch

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/include/sound/soc-acpi.h (modified) (6 diffs)

GPL/trunk/alsa-kernel/include/sound/soc-acpi.h

@@ -1 +1 @@
 /* SPDX-License-Identifier: GPL-2.0-only
  *
- * Copyright (C) 2013-15, Intel Corporation. All rights reserved.
+ * Copyright (C) 2013-15, Intel Corporation
  */
 
@@ -63 +63 @@
  * @codec_mask: used for HDAudio support
  * @dmic_num: number of SoC- or chipset-attached PDM digital microphones
- * @common_hdmi_codec_drv: use commom HDAudio HDMI codec driver
  * @link_mask: SoundWire links enabled on the board
  * @links: array of SoundWire link _ADR descriptors, null terminated
@@ -71 +70 @@
  * @subsystem_vendor: optional PCI SSID vendor value
  * @subsystem_device: optional PCI SSID device value
+ * @subsystem_rev: optional PCI SSID revision value
  * @subsystem_id_set: true if a value has been written to
  *                    subsystem_vendor and subsystem_device.
+ * @bt_link_mask: BT offload link enabled on the board
  */
 struct snd_soc_acpi_mach_params {
@@ -79 +80 @@
         u32 codec_mask;
         u32 dmic_num;
-        bool common_hdmi_codec_drv;
         u32 link_mask;
         const struct snd_soc_acpi_link_adr *links;
@@ -87 +87 @@
         unsigned short subsystem_vendor;
         unsigned short subsystem_device;
+        unsigned short subsystem_rev;
         bool subsystem_id_set;
+        u32 bt_link_mask;
 };
 
@@ -151 +153 @@
  */
 #define SND_SOC_ACPI_TPLG_INTEL_DMIC_NUMBER BIT(2)
+
+/*
+ * when set the speaker amplifier name suffix (i.e. "-max98360a") will be
+ * appended to topology file name
+ */
+#define SND_SOC_ACPI_TPLG_INTEL_AMP_NAME BIT(3)
+
+/*
+ * when set the headphone codec name suffix (i.e. "-rt5682") will be appended to
+ * topology file name
+ */
+#define SND_SOC_ACPI_TPLG_INTEL_CODEC_NAME BIT(4)
 
 /**