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

Timestamp:

Apr 19, 2025, 8:08:37 PM (7 months ago)

Author:

David Azarewicz

Message:

Merge in changes from 6.6-LTS branch.
Fixed additional 25+ problems.

Location:

GPL/trunk

Files:

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

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

@@ -10 +10 @@
 #include <linux/acpi.h>
 #include <linux/mod_devicetable.h>
+#include <linux/soundwire/sdw.h>
 
 struct snd_soc_acpi_package_context {
@@ -61 +62 @@
  * @platform: string used for HDAudio codec support
  * @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: links enabled on the board
- * @links: array of link _ADR descriptors, null terminated
+ * @link_mask: SoundWire links enabled on the board
+ * @links: array of SoundWire link _ADR descriptors, null terminated
+ * @i2s_link_mask: I2S/TDM links enabled on the board
  * @num_dai_drivers: number of elements in @dai_drivers
  * @dai_drivers: pointer to dai_drivers, used e.g. in nocodec mode
+ * @subsystem_vendor: optional PCI SSID vendor value
+ * @subsystem_device: optional PCI SSID device value
+ * @subsystem_id_set: true if a value has been written to
+ *                    subsystem_vendor and subsystem_device.
  */
 struct snd_soc_acpi_mach_params {
@@ -75 +82 @@
         u32 link_mask;
         const struct snd_soc_acpi_link_adr *links;
+        u32 i2s_link_mask;
         u32 num_dai_drivers;
         struct snd_soc_dai_driver *dai_drivers;
+        unsigned short subsystem_vendor;
+        unsigned short subsystem_device;
+        bool subsystem_id_set;
 };
 
@@ -123 +134 @@
 };
 
+/*
+ * when set the topology uses the -ssp<N> suffix, where N is determined based on
+ * BIOS or DMI information
+ */
+#define SND_SOC_ACPI_TPLG_INTEL_SSP_NUMBER BIT(0)
+
+/*
+ * when more than one SSP is reported in the link mask, use the most significant.
+ * This choice was found to be valid on platforms with ES8336 codecs.
+ */
+#define SND_SOC_ACPI_TPLG_INTEL_SSP_MSB BIT(1)
+
+/*
+ * when set the topology uses the -dmic<N>ch suffix, where N is determined based on
+ * BIOS or DMI information
+ */
+#define SND_SOC_ACPI_TPLG_INTEL_DMIC_NUMBER BIT(2)
+
 /**
  * snd_soc_acpi_mach: ACPI-based machine descriptor. Most of the fields are
@@ -130 +159 @@
  *
  * @id: ACPI ID (usually the codec's) used to find a matching machine driver.
+ * @uid: ACPI Unique ID, can be used to disambiguate matches.
+ * @comp_ids: list of compatible audio codecs using the same machine driver,
+ * firmware and topology
  * @link_mask: describes required board layout, e.g. for SoundWire.
  * @links: array of link _ADR descriptors, null terminated.
  * @drv_name: machine driver name
  * @fw_filename: firmware file name. Used when SOF is not enabled.
+ * @tplg_filename: topology file name. Used when SOF is not enabled.
  * @board: board name
  * @machine_quirk: pointer to quirk, usually based on DMI information when
@@ -141 +174 @@
  * @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
+ * @tplg_quirk_mask: quirks to select different topology files dynamically
  */
 /* Descriptor for SST ASoC machine driver */
 struct snd_soc_acpi_mach {
-        const u8 id[ACPI_ID_LEN];
+        u8 id[ACPI_ID_LEN];
+        const char *uid;
+        const struct snd_soc_acpi_codecs *comp_ids;
         const u32 link_mask;
         const struct snd_soc_acpi_link_adr *links;
         const char *drv_name;
         const char *fw_filename;
+        const char *tplg_filename;
         const char *board;
         struct snd_soc_acpi_mach * (*machine_quirk)(void *arg);
@@ -156 +192 @@
         void *pdata;
         struct snd_soc_acpi_mach_params mach_params;
-        const char *sof_fw_filename;
         const char *sof_tplg_filename;
+        const u32 tplg_quirk_mask;
 };
 
@@ -182 +218 @@
 }
 
+bool snd_soc_acpi_sdw_link_slaves_found(struct device *dev,
+                                        const struct snd_soc_acpi_link_adr *link,
+                                        struct sdw_extended_slave_id *ids,
+                                        int num_slaves);
+
 #endif