Changeset 772 for GPL/trunk/alsa-kernel/include/sound/soc-component.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/soc-component.h (modified) (15 diffs)

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

@@ -99 +99 @@
         int (*set_jack)(struct snd_soc_component *component,
                         struct snd_soc_jack *jack,  void *data);
+        int (*get_jack_type)(struct snd_soc_component *component);
 
         /* DT */
@@ -137 +138 @@
                 struct snd_pcm_audio_tstamp_config *audio_tstamp_config,
                 struct snd_pcm_audio_tstamp_report *audio_tstamp_report);
-        int (*copy_user)(struct snd_soc_component *component,
-                         struct snd_pcm_substream *substream, int channel,
-                         unsigned long pos, void __user *buf,
-                         unsigned long bytes);
+        int (*copy)(struct snd_soc_component *component,
+                    struct snd_pcm_substream *substream, int channel,
+                    unsigned long pos, struct iov_iter *iter,
+                    unsigned long bytes);
         struct page *(*page)(struct snd_soc_component *component,
                              struct snd_pcm_substream *substream,
@@ -149 +150 @@
         int (*ack)(struct snd_soc_component *component,
                    struct snd_pcm_substream *substream);
+        snd_pcm_sframes_t (*delay)(struct snd_soc_component *component,
+                                   struct snd_pcm_substream *substream);
 
         const struct snd_compress_ops *compress_ops;
@@ -155 +158 @@
         int probe_order;
         int remove_order;
+
+        /*
+         * soc_pcm_trigger() start/stop sequence.
+         * see also
+         *      snd_soc_dai_link
+         *      soc_pcm_trigger()
+         */
+        enum snd_soc_trigger_order trigger_start;
+        enum snd_soc_trigger_order trigger_stop;
 
         /*
@@ -168 +180 @@
         unsigned int suspend_bias_off:1;
         unsigned int use_pmdown_time:1; /* care pmdown_time at stop */
+        /*
+         * Indicates that the component does not care about the endianness of
+         * PCM audio data and the core will ensure that both LE and BE variants
+         * of each used format are present. Typically this is because the
+         * component sits behind a bus that abstracts away the endian of the
+         * original data, ie. one for which the transmission endian is defined
+         * (I2S/SLIMbus/SoundWire), or the concept of endian doesn't exist (PDM,
+         * analogue).
+         */
         unsigned int endianness:1;
-        unsigned int non_legacy_dai_naming:1;
+        unsigned int legacy_dai_naming:1;
 
         /* this component uses topology and ignore machine driver FEs */
@@ -178 +199 @@
         bool use_dai_pcm_id;    /* use DAI link PCM ID as PCM device number */
         int be_pcm_base;        /* base device ID for all BE PCMs */
+
+#ifdef CONFIG_DEBUG_FS
+        const char *debugfs_prefix;
+#endif
 };
 
@@ -221 +246 @@
 
         /* function mark */
-        struct snd_pcm_substream *mark_module;
+        void *mark_module;
         struct snd_pcm_substream *mark_open;
         struct snd_pcm_substream *mark_hw_params;
@@ -228 +253 @@
         void *mark_pm;
 
-#ifdef CONFIG_DEBUG_FS
         struct dentry *debugfs_root;
         const char *debugfs_prefix;
-#endif
 };
 
@@ -372 +395 @@
 int snd_soc_component_set_jack(struct snd_soc_component *component,
                                struct snd_soc_jack *jack, void *data);
+int snd_soc_component_get_jack_type(struct snd_soc_component *component);
 
 void snd_soc_component_seq_notifier(struct snd_soc_component *component,
@@ -392 +416 @@
         snd_soc_component_module_get(component, substream, 1)
 int snd_soc_component_module_get(struct snd_soc_component *component,
-                                 struct snd_pcm_substream *substream,
-                                 int upon_open);
+                                 void *mark, int upon_open);
 #define snd_soc_component_module_put_when_remove(component)     \
         snd_soc_component_module_put(component, NULL, 0, 0)
@@ -399 +422 @@
         snd_soc_component_module_put(component, substream, 1, rollback)
 void snd_soc_component_module_put(struct snd_soc_component *component,
-                                  struct snd_pcm_substream *substream,
-                                  int upon_open, int rollback);
+                                  void *mark, int upon_open, int rollback);
 
 static inline void snd_soc_component_set_drvdata(struct snd_soc_component *c,
@@ -440 +462 @@
         const char *pin);
 
+/* component controls */
+int snd_soc_component_notify_control(struct snd_soc_component *component,
+                                     const char * const ctl);
+
 /* component driver ops */
 int snd_soc_component_open(struct snd_soc_component *component,
@@ -456 +482 @@
                                         const struct of_phandle_args *args,
                                         const char **dai_name);
-int snd_soc_component_compr_open(struct snd_compr_stream *cstream);
-void snd_soc_component_compr_free(struct snd_compr_stream *cstream,
+int snd_soc_component_compr_open(struct snd_soc_component *component,
+                                 struct snd_compr_stream *cstream);
+void snd_soc_component_compr_free(struct snd_soc_component *component,
+                                  struct snd_compr_stream *cstream,
                                   int rollback);
 int snd_soc_component_compr_trigger(struct snd_compr_stream *cstream, int cmd);
@@ -482 +510 @@
                                 unsigned int cmd, void *arg);
 int snd_soc_pcm_component_sync_stop(struct snd_pcm_substream *substream);
-int snd_soc_pcm_component_copy_user(struct snd_pcm_substream *substream,
-                                    int channel, unsigned long pos,
-                                    void __user *buf, unsigned long bytes);
+int snd_soc_pcm_component_copy(struct snd_pcm_substream *substream,
+                               int channel, unsigned long pos,
+                               struct iov_iter *iter, unsigned long bytes);
 struct page *snd_soc_pcm_component_page(struct snd_pcm_substream *substream,
                                         unsigned long offset);
@@ -503 +531 @@
                                           void *stream, int rollback);
 int snd_soc_pcm_component_ack(struct snd_pcm_substream *substream);
+void snd_soc_pcm_component_delay(struct snd_pcm_substream *substream,
+                                 snd_pcm_sframes_t *cpu_delay, snd_pcm_sframes_t *codec_delay);
 
 #endif /* __SOC_COMPONENT_H */