Changeset 772 for GPL/trunk/alsa-kernel/include/sound/intel-nhlt.h

Timestamp:

Apr 19, 2025, 8:08:37 PM (4 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/intel-nhlt.h (modified) (5 diffs)

GPL/trunk/alsa-kernel/include/sound/intel-nhlt.h

@@ -11 +11 @@
 #include <linux/acpi.h>
 
-#if IS_ENABLED(CONFIG_ACPI) && IS_ENABLED(CONFIG_SND_INTEL_NHLT)
+enum nhlt_link_type {
+        NHLT_LINK_HDA = 0,
+        NHLT_LINK_DSP = 1,
+        NHLT_LINK_DMIC = 2,
+        NHLT_LINK_SSP = 3,
+        NHLT_LINK_INVALID
+};
+
+enum nhlt_device_type {
+        NHLT_DEVICE_BT = 0,
+        NHLT_DEVICE_DMIC = 1,
+        NHLT_DEVICE_I2S = 4,
+        NHLT_DEVICE_INVALID
+};
 
 struct wav_fmt {
@@ -33 +46 @@
         u8 sub_fmt[16];
 } __packed;
-
-enum nhlt_link_type {
-        NHLT_LINK_HDA = 0,
-        NHLT_LINK_DSP = 1,
-        NHLT_LINK_DMIC = 2,
-        NHLT_LINK_SSP = 3,
-        NHLT_LINK_INVALID
-};
-
-enum nhlt_device_type {
-        NHLT_DEVICE_BT = 0,
-        NHLT_DEVICE_DMIC = 1,
-        NHLT_DEVICE_I2S = 4,
-        NHLT_DEVICE_INVALID
-};
 
 struct nhlt_specific_cfg {
@@ -127 +125 @@
 };
 
+#if IS_ENABLED(CONFIG_ACPI) && IS_ENABLED(CONFIG_SND_INTEL_NHLT)
+
 struct nhlt_acpi_table *intel_nhlt_init(struct device *dev);
 
@@ -133 +133 @@
 int intel_nhlt_get_dmic_geo(struct device *dev, struct nhlt_acpi_table *nhlt);
 
+bool intel_nhlt_has_endpoint_type(struct nhlt_acpi_table *nhlt, u8 link_type);
+
+int intel_nhlt_ssp_endpoint_mask(struct nhlt_acpi_table *nhlt, u8 device_type);
+
+int intel_nhlt_ssp_mclk_mask(struct nhlt_acpi_table *nhlt, int ssp_num);
+
+struct nhlt_specific_cfg *
+intel_nhlt_get_endpoint_blob(struct device *dev, struct nhlt_acpi_table *nhlt,
+                             u32 bus_id, u8 link_type, u8 vbps, u8 bps,
+                             u8 num_ch, u32 rate, u8 dir, u8 dev_type);
+
 #else
-
-struct nhlt_acpi_table;
 
 static inline struct nhlt_acpi_table *intel_nhlt_init(struct device *dev)
@@ -151 +160 @@
         return 0;
 }
+
+static inline bool intel_nhlt_has_endpoint_type(struct nhlt_acpi_table *nhlt,
+                                                u8 link_type)
+{
+        return false;
+}
+
+static inline int intel_nhlt_ssp_endpoint_mask(struct nhlt_acpi_table *nhlt, u8 device_type)
+{
+        return 0;
+}
+
+static inline int intel_nhlt_ssp_mclk_mask(struct nhlt_acpi_table *nhlt, int ssp_num)
+{
+        return 0;
+}
+
+static inline struct nhlt_specific_cfg *
+intel_nhlt_get_endpoint_blob(struct device *dev, struct nhlt_acpi_table *nhlt,
+                             u32 bus_id, u8 link_type, u8 vbps, u8 bps,
+                             u8 num_ch, u32 rate, u8 dir, u8 dev_type)
+{
+        return NULL;
+}
+
 #endif