1 files changed, 37 insertions, 5 deletions

diff --git a/include/sound/soc.h b/include/sound/soc.h
index a8b4b9c8b1d2..a2deeb954c21 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -110,6 +110,14 @@
         .put = snd_soc_put_volsw, \
         .private_value = SOC_DOUBLE_VALUE(reg, shift_left, shift_right, \
                                           max, invert, 0) }
+#define SOC_DOUBLE_STS(xname, reg, shift_left, shift_right, max, invert) \
+{                                                                       \
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),           \
+        .info = snd_soc_info_volsw, .get = snd_soc_get_volsw,           \
+        .access = SNDRV_CTL_ELEM_ACCESS_READ |                          \
+                SNDRV_CTL_ELEM_ACCESS_VOLATILE,                         \
+        .private_value = SOC_DOUBLE_VALUE(reg, shift_left, shift_right, \
+                                          max, invert, 0) }
 #define SOC_DOUBLE_R(xname, reg_left, reg_right, xshift, xmax, xinvert) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
         .info = snd_soc_info_volsw, \
@@ -293,6 +301,9 @@
                 {.base = xbase, .num_regs = xregs,            \
                  .mask = xmask }) }
 
+/*
+ * SND_SOC_BYTES_EXT is deprecated, please USE SND_SOC_BYTES_TLV instead
+ */
 #define SND_SOC_BYTES_EXT(xname, xcount, xhandler_get, xhandler_put) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
         .info = snd_soc_bytes_info_ext, \
@@ -1037,6 +1048,9 @@ struct snd_soc_dai_link {
 
         /* pmdown_time is ignored at stop */
         unsigned int ignore_pmdown_time:1;
+
+        struct list_head list; /* DAI link list of the soc card */
+        struct snd_soc_dobj dobj; /* For topology */
 };
 
 struct snd_soc_codec_conf {
@@ -1101,12 +1115,20 @@ struct snd_soc_card {
                                    struct snd_soc_dapm_context *dapm,
                                    enum snd_soc_bias_level level);
 
+        int (*add_dai_link)(struct snd_soc_card *,
+                            struct snd_soc_dai_link *link);
+        void (*remove_dai_link)(struct snd_soc_card *,
+                            struct snd_soc_dai_link *link);
+
         long pmdown_time;
 
         /* CPU <--> Codec DAI links  */
-        struct snd_soc_dai_link *dai_link;
-        int num_links;
-        struct snd_soc_pcm_runtime *rtd;
+        struct snd_soc_dai_link *dai_link;  /* predefined links only */
+        int num_links;  /* predefined links only */
+        struct list_head dai_link_list; /* all links */
+        int num_dai_links;
+
+        struct list_head rtd_list;
         int num_rtd;
 
         /* optional codec specific configuration */
@@ -1201,6 +1223,9 @@ struct snd_soc_pcm_runtime {
         struct dentry *debugfs_dpcm_root;
         struct dentry *debugfs_dpcm_state;
 #endif
+
+        unsigned int num; /* 0-based and monotonic increasing */
+        struct list_head list; /* rtd list of the soc card */
 };
 
 /* mixer control */
@@ -1225,8 +1250,10 @@ struct soc_bytes_ext {
         struct snd_soc_dobj dobj;
 
         /* used for TLV byte control */
-        int (*get)(unsigned int __user *bytes, unsigned int size);
-        int (*put)(const unsigned int __user *bytes, unsigned int size);
+        int (*get)(struct snd_kcontrol *kcontrol, unsigned int __user *bytes,
+                        unsigned int size);
+        int (*put)(struct snd_kcontrol *kcontrol, const unsigned int __user *bytes,
+                        unsigned int size);
 };
 
 /* multi register control */
@@ -1644,6 +1671,11 @@ int snd_soc_of_get_dai_link_codecs(struct device *dev,
                                    struct device_node *of_node,
                                    struct snd_soc_dai_link *dai_link);
 
+int snd_soc_add_dai_link(struct snd_soc_card *card,
+                                struct snd_soc_dai_link *dai_link);
+void snd_soc_remove_dai_link(struct snd_soc_card *card,
+                             struct snd_soc_dai_link *dai_link);
+
 #include <sound/soc-dai.h>
 
 #ifdef CONFIG_DEBUG_FS