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

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/sound/soc.h (modified) (12 diffs)

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

@@ -491 +491 @@
         const struct snd_pcm_hardware *hw);
 
-/* Jack reporting */
-void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask);
-int snd_soc_jack_add_pins(struct snd_soc_jack *jack, int count,
-                          struct snd_soc_jack_pin *pins);
-void snd_soc_jack_notifier_register(struct snd_soc_jack *jack,
-                                    struct notifier_block *nb);
-void snd_soc_jack_notifier_unregister(struct snd_soc_jack *jack,
-                                      struct notifier_block *nb);
-int snd_soc_jack_add_zones(struct snd_soc_jack *jack, int count,
-                          struct snd_soc_jack_zone *zones);
-int snd_soc_jack_get_type(struct snd_soc_jack *jack, int micbias_voltage);
-#ifdef CONFIG_GPIOLIB
-int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
-                        struct snd_soc_jack_gpio *gpios);
-int snd_soc_jack_add_gpiods(struct device *gpiod_dev,
-                            struct snd_soc_jack *jack,
-                            int count, struct snd_soc_jack_gpio *gpios);
-void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count,
-                        struct snd_soc_jack_gpio *gpios);
-#else
-static inline int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
-                                         struct snd_soc_jack_gpio *gpios)
-{
-        return 0;
-}
-
-static inline int snd_soc_jack_add_gpiods(struct device *gpiod_dev,
-                                          struct snd_soc_jack *jack,
-                                          int count,
-                                          struct snd_soc_jack_gpio *gpios)
-{
-        return 0;
-}
-
-static inline void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count,
-                                           struct snd_soc_jack_gpio *gpios)
-{
-}
-#endif
-
 struct snd_ac97 *snd_soc_alloc_ac97_component(struct snd_soc_component *component);
 struct snd_ac97 *snd_soc_new_ac97_component(struct snd_soc_component *component,
@@ -617 +577 @@
         struct snd_ctl_elem_value *ucontrol);
 
-/**
- * struct snd_soc_jack_pin - Describes a pin to update based on jack detection
- *
- * @pin:    name of the pin to update
- * @mask:   bits to check for in reported jack status
- * @invert: if non-zero then pin is enabled when status is not reported
- * @list:   internal list entry
- */
-struct snd_soc_jack_pin {
-        struct list_head list;
-        const char *pin;
-        int mask;
-        bool invert;
-};
-
-/**
- * struct snd_soc_jack_zone - Describes voltage zones of jack detection
- *
- * @min_mv: start voltage in mv
- * @max_mv: end voltage in mv
- * @jack_type: type of jack that is expected for this voltage
- * @debounce_time: debounce_time for jack, codec driver should wait for this
- *              duration before reading the adc for voltages
- * @list:   internal list entry
- */
-struct snd_soc_jack_zone {
-        unsigned int min_mv;
-        unsigned int max_mv;
-        unsigned int jack_type;
-        unsigned int debounce_time;
-        struct list_head list;
-};
-
-/**
- * struct snd_soc_jack_gpio - Describes a gpio pin for jack detection
- *
- * @gpio:         legacy gpio number
- * @idx:          gpio descriptor index within the function of the GPIO
- *                consumer device
- * @gpiod_dev:    GPIO consumer device
- * @name:         gpio name. Also as connection ID for the GPIO consumer
- *                device function name lookup
- * @report:       value to report when jack detected
- * @invert:       report presence in low state
- * @debounce_time: debounce time in ms
- * @wake:         enable as wake source
- * @jack_status_check: callback function which overrides the detection
- *                     to provide more complex checks (eg, reading an
- *                     ADC).
- */
-struct snd_soc_jack_gpio {
-        unsigned int gpio;
-        unsigned int idx;
-        struct device *gpiod_dev;
-        const char *name;
-        int report;
-        int invert;
-        int debounce_time;
-        bool wake;
-
-        /* private: */
-        struct snd_soc_jack *jack;
-        struct delayed_work work;
-        struct notifier_block pm_notifier;
-        struct gpio_desc *desc;
-
-        void *data;
-        /* public: */
-        int (*jack_status_check)(void *data);
-};
-
-struct snd_soc_jack {
-        struct mutex mutex;
-        struct snd_jack *jack;
-        struct snd_soc_card *card;
-        struct list_head pins;
-        int status;
-        struct blocking_notifier_head notifier;
-        struct list_head jack_zones;
-};
-
 /* SoC PCM stream information */
 struct snd_soc_pcm_stream {
@@ -807 +686 @@
 
         /* Symmetry requirements */
-        unsigned int symmetric_rates:1;
+        unsigned int symmetric_rate:1;
         unsigned int symmetric_channels:1;
-        unsigned int symmetric_samplebits:1;
+        unsigned int symmetric_sample_bits:1;
 
         /* Do not create a PCM for this DAI link (Backend link) */
@@ -834 +713 @@
         unsigned int ignore:1;
 
+        /* This flag will reorder stop sequence. By enabling this flag
+         * DMA controller stop sequence will be invoked first followed by
+         * CPU DAI driver stop sequence
+         */
+        unsigned int stop_dma_first:1;
+
 #ifdef CONFIG_SND_SOC_TOPOLOGY
         struct snd_soc_dobj dobj; /* For topology */
 #endif
 };
+
+static inline struct snd_soc_dai_link_component*
+asoc_link_to_cpu(struct snd_soc_dai_link *link, int n) {
+        return &(link)->cpus[n];
+}
+
+static inline struct snd_soc_dai_link_component*
+asoc_link_to_codec(struct snd_soc_dai_link *link, int n) {
+        return &(link)->codecs[n];
+}
+
+static inline struct snd_soc_dai_link_component*
+asoc_link_to_platform(struct snd_soc_dai_link *link, int n) {
+        return &(link)->platforms[n];
+}
+
 #define for_each_link_codecs(link, i, codec)                            \
         for ((i) = 0;                                                   \
-             ((i) < link->num_codecs) && ((codec) = &link->codecs[i]);  \
+             ((i) < link->num_codecs) &&                                \
+                     ((codec) = asoc_link_to_codec(link, i));           \
              (i)++)
 
@@ -846 +748 @@
         for ((i) = 0;                                                   \
              ((i) < link->num_platforms) &&                             \
-             ((platform) = &link->platforms[i]);                        \
+                     ((platform) = asoc_link_to_platform(link, i));     \
              (i)++)
 
 #define for_each_link_cpus(link, i, cpu)                                \
         for ((i) = 0;                                                   \
-             ((i) < link->num_cpus) && ((cpu) = &link->cpus[i]);        \
+             ((i) < link->num_cpus) &&                                  \
+                     ((cpu) = asoc_link_to_cpu(link, i));               \
              (i)++)
 
@@ -1085 +988 @@
         unsigned int disable_route_checks:1;
         unsigned int probed:1;
+        unsigned int component_chaining:1;
 
         void *drvdata;
@@ -1162 +1066 @@
         /* function mark */
         struct snd_pcm_substream *mark_startup;
+        struct snd_pcm_substream *mark_hw_params;
+        struct snd_pcm_substream *mark_trigger;
+        struct snd_compr_stream  *mark_compr_startup;
 
         /* bit field */
@@ -1184 +1091 @@
              ((i) < rtd->num_cpus) && ((dai) = asoc_rtd_to_cpu(rtd, i)); \
              (i)++)
-#define for_each_rtd_cpu_dais_rollback(rtd, i, dai)             \
-        for (; (--(i) >= 0) && ((dai) = asoc_rtd_to_cpu(rtd, i));)
 #define for_each_rtd_codec_dais(rtd, i, dai)                            \
         for ((i) = 0;                                                   \
              ((i) < rtd->num_codecs) && ((dai) = asoc_rtd_to_codec(rtd, i)); \
              (i)++)
-#define for_each_rtd_codec_dais_rollback(rtd, i, dai)           \
-        for (; (--(i) >= 0) && ((dai) = asoc_rtd_to_codec(rtd, i));)
 #define for_each_rtd_dais(rtd, i, dai)                                  \
         for ((i) = 0;                                                   \
@@ -1197 +1100 @@
                      ((dai) = (rtd)->dais[i]);                          \
              (i)++)
-#define for_each_rtd_dais_rollback(rtd, i, dai)         \
-        for (; (--(i) >= 0) && ((dai) = (rtd)->dais[i]);)
 
 void snd_soc_close_delayed_work(struct snd_soc_pcm_runtime *rtd);
@@ -1343 +1244 @@
                                      struct device_node **framemaster);
 int snd_soc_get_dai_id(struct device_node *ep);
-int snd_soc_get_dai_name(struct of_phandle_args *args,
+int snd_soc_get_dai_name(const struct of_phandle_args *args,
                          const char **dai_name);
 int snd_soc_of_get_dai_name(struct device_node *of_node,
@@ -1386 +1287 @@
         /* set platform name for each dailink */
         for_each_card_prelinks(card, i, dai_link) {
+                /* only single platform is supported for now */
+                if (dai_link->num_platforms != 1)
+                        return -EINVAL;
+
+                if (!dai_link->platforms)
+                        return -EINVAL;
+
                 name = devm_kstrdup(card->dev, platform_name, GFP_KERNEL);
                 if (!name)
                         return -ENOMEM;
 
-                if (!dai_link->platforms)
-                        return -EINVAL;
-
                 /* only single platform is supported for now */
                 dai_link->platforms->name = name;
@@ -1419 +1324 @@
 #include <sound/soc-component.h>
 #include <sound/soc-card.h>
+#include <sound/soc-jack.h>
 
 #endif