Changeset 695 for GPL/trunk/alsa-kernel/include/uapi

Timestamp:

Aug 21, 2021, 3:35:34 AM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/include/uapi/sound/asoc.h (modified) (2 diffs)
• alsa-kernel/include/uapi/sound/sof/abi.h (modified) (1 diff)

GPL/trunk/alsa-kernel/include/uapi/sound/asoc.h

@@ -171 +171 @@
 
 /* DAI topology BCLK parameter
- * For the backwards capability, by default codec is bclk master
- */
-#define SND_SOC_TPLG_BCLK_CM         0 /* codec is bclk master */
-#define SND_SOC_TPLG_BCLK_CS         1 /* codec is bclk slave */
+ * For the backwards capability, by default codec is bclk provider
+ */
+#define SND_SOC_TPLG_BCLK_CP         0 /* codec is bclk provider */
+#define SND_SOC_TPLG_BCLK_CC         1 /* codec is bclk consumer */
+/* keep previous definitions for compatibility */
+#define SND_SOC_TPLG_BCLK_CM         SND_SOC_TPLG_BCLK_CP
+#define SND_SOC_TPLG_BCLK_CS         SND_SOC_TPLG_BCLK_CC
 
 /* DAI topology FSYNC parameter
- * For the backwards capability, by default codec is fsync master
- */
-#define SND_SOC_TPLG_FSYNC_CM         0 /* codec is fsync master */
-#define SND_SOC_TPLG_FSYNC_CS         1 /* codec is fsync slave */
+ * For the backwards capability, by default codec is fsync provider
+ */
+#define SND_SOC_TPLG_FSYNC_CP         0 /* codec is fsync provider */
+#define SND_SOC_TPLG_FSYNC_CC         1 /* codec is fsync consumer */
+/* keep previous definitions for compatibility */
+#define SND_SOC_TPLG_FSYNC_CM         SND_SOC_TPLG_FSYNC_CP
+#define SND_SOC_TPLG_FSYNC_CS         SND_SOC_TPLG_FSYNC_CC
 
 /*
@@ -337 +343 @@
         __u8 invert_bclk;       /* 1 for inverted BCLK, 0 for normal */
         __u8 invert_fsync;      /* 1 for inverted frame clock, 0 for normal */
-        __u8 bclk_master;       /* SND_SOC_TPLG_BCLK_ value */
-        __u8 fsync_master;      /* SND_SOC_TPLG_FSYNC_ value */
+        __u8 bclk_provider;     /* SND_SOC_TPLG_BCLK_ value */
+        __u8 fsync_provider;    /* SND_SOC_TPLG_FSYNC_ value */
         __u8 mclk_direction;    /* SND_SOC_TPLG_MCLK_ value */
         __le16 reserved;        /* for 32bit alignment */

GPL/trunk/alsa-kernel/include/uapi/sound/sof/abi.h

@@ -27 +27 @@
 /* SOF ABI version major, minor and patch numbers */
 #define SOF_ABI_MAJOR 3
-#define SOF_ABI_MINOR 17
+#define SOF_ABI_MINOR 18
 #define SOF_ABI_PATCH 0