1 files changed, 96 insertions, 22 deletions

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 2ebf7877c148..c703871f5f65 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -55,6 +55,18 @@
         .info = snd_soc_info_volsw, .get = snd_soc_get_volsw,\
         .put = snd_soc_put_volsw, \
         .private_value =  SOC_SINGLE_VALUE(reg, shift, max, invert) }
+#define SOC_SINGLE_SX_TLV(xname, xreg, xshift, xmin, xmax, tlv_array) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+        .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \
+        SNDRV_CTL_ELEM_ACCESS_READWRITE, \
+        .tlv.p  = (tlv_array),\
+        .info = snd_soc_info_volsw, \
+        .get = snd_soc_get_volsw_sx,\
+        .put = snd_soc_put_volsw_sx, \
+        .private_value = (unsigned long)&(struct soc_mixer_control) \
+                {.reg = xreg, .rreg = xreg, \
+                .shift = xshift, .rshift = xshift, \
+                .max = xmax, .min = xmin} }
 #define SOC_DOUBLE(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, \
@@ -85,6 +97,18 @@
         .get = snd_soc_get_volsw, .put = snd_soc_put_volsw, \
         .private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, xshift, \
                                             xmax, xinvert) }
+#define SOC_DOUBLE_R_SX_TLV(xname, xreg, xrreg, xshift, xmin, xmax, tlv_array) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
+        .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \
+        SNDRV_CTL_ELEM_ACCESS_READWRITE, \
+        .tlv.p  = (tlv_array), \
+        .info = snd_soc_info_volsw, \
+        .get = snd_soc_get_volsw_sx, \
+        .put = snd_soc_put_volsw_sx, \
+        .private_value = (unsigned long)&(struct soc_mixer_control) \
+                {.reg = xreg, .rreg = xrreg, \
+                .shift = xshift, .rshift = xshift, \
+                .max = xmax, .min = xmin} }
 #define SOC_DOUBLE_S8_TLV(xname, xreg, xmin, xmax, tlv_array) \
 {       .iface  = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
         .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \
@@ -171,20 +195,6 @@
         .get = xhandler_get, .put = xhandler_put, \
         .private_value = (unsigned long)&xenum }
 
-#define SOC_DOUBLE_R_SX_TLV(xname, xreg_left, xreg_right, xshift,\
-                xmin, xmax, tlv_array) \
-{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
-        .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \
-                  SNDRV_CTL_ELEM_ACCESS_READWRITE, \
-        .tlv.p = (tlv_array), \
-        .info = snd_soc_info_volsw_2r_sx, \
-        .get = snd_soc_get_volsw_2r_sx, \
-        .put = snd_soc_put_volsw_2r_sx, \
-        .private_value = (unsigned long)&(struct soc_mixer_control) \
-                {.reg = xreg_left, \
-                 .rreg = xreg_right, .shift = xshift, \
-                 .min = xmin, .max = xmax} }
-
 #define SND_SOC_BYTES(xname, xbase, xregs)                    \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,   \
         .info = snd_soc_bytes_info, .get = snd_soc_bytes_get, \
@@ -200,6 +210,19 @@
                 {.base = xbase, .num_regs = xregs,            \
                  .mask = xmask }) }
 
+#define SOC_SINGLE_XR_SX(xname, xregbase, xregcount, xnbits, \
+                xmin, xmax, xinvert) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
+        .info = snd_soc_info_xr_sx, .get = snd_soc_get_xr_sx, \
+        .put = snd_soc_put_xr_sx, \
+        .private_value = (unsigned long)&(struct soc_mreg_control) \
+                {.regbase = xregbase, .regcount = xregcount, .nbits = xnbits, \
+                .invert = xinvert, .min = xmin, .max = xmax} }
+
+#define SOC_SINGLE_STROBE(xname, xreg, xshift, xinvert) \
+        SOC_SINGLE_EXT(xname, xreg, xshift, 1, xinvert, \
+                snd_soc_get_strobe, snd_soc_put_strobe)
+
 /*
  * Simplified versions of above macros, declaring a struct and calculating
  * ARRAY_SIZE internally
@@ -264,6 +287,7 @@ struct snd_soc_jack_zone;
 struct snd_soc_jack_pin;
 struct snd_soc_cache_ops;
 #include <sound/soc-dapm.h>
+#include <sound/soc-dpcm.h>
 
 #ifdef CONFIG_GPIOLIB
 struct snd_soc_jack_gpio;
@@ -288,6 +312,11 @@ enum snd_soc_pcm_subclass {
         SND_SOC_PCM_CLASS_BE    = 1,
 };
 
+enum snd_soc_card_subclass {
+        SND_SOC_CARD_CLASS_INIT         = 0,
+        SND_SOC_CARD_CLASS_RUNTIME      = 1,
+};
+
 int snd_soc_codec_set_sysclk(struct snd_soc_codec *codec, int clk_id,
                              int source, unsigned int freq, int dir);
 int snd_soc_codec_set_pll(struct snd_soc_codec *codec, int pll_id, int source,
@@ -333,6 +362,11 @@ int snd_soc_platform_write(struct snd_soc_platform *platform,
                                         unsigned int reg, unsigned int val);
 int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num);
 
+struct snd_pcm_substream *snd_soc_get_dai_substream(struct snd_soc_card *card,
+                const char *dai_link, int stream);
+struct snd_soc_pcm_runtime *snd_soc_get_pcm_runtime(struct snd_soc_card *card,
+                const char *dai_link);
+
 /* Utility functions to get clock rates from various things */
 int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots);
 int snd_soc_params_to_frame_size(struct snd_pcm_hw_params *params);
@@ -343,6 +377,9 @@ int snd_soc_params_to_bclk(struct snd_pcm_hw_params *parms);
 int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,
         const struct snd_pcm_hardware *hw);
 
+int snd_soc_platform_trigger(struct snd_pcm_substream *substream,
+                int cmd, struct snd_soc_platform *platform);
+
 /* Jack reporting */
 int snd_soc_jack_new(struct snd_soc_codec *codec, const char *id, int type,
                      struct snd_soc_jack *jack);
@@ -413,6 +450,10 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol);
 #define snd_soc_get_volsw_2r snd_soc_get_volsw
 #define snd_soc_put_volsw_2r snd_soc_put_volsw
+int snd_soc_get_volsw_sx(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol);
+int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol);
 int snd_soc_info_volsw_s8(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_info *uinfo);
 int snd_soc_get_volsw_s8(struct snd_kcontrol *kcontrol,
@@ -421,19 +462,22 @@ int snd_soc_put_volsw_s8(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol);
 int snd_soc_limit_volume(struct snd_soc_codec *codec,
         const char *name, int max);
-int snd_soc_info_volsw_2r_sx(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_info *uinfo);
-int snd_soc_get_volsw_2r_sx(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_value *ucontrol);
-int snd_soc_put_volsw_2r_sx(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_value *ucontrol);
 int snd_soc_bytes_info(struct snd_kcontrol *kcontrol,
                        struct snd_ctl_elem_info *uinfo);
 int snd_soc_bytes_get(struct snd_kcontrol *kcontrol,
                       struct snd_ctl_elem_value *ucontrol);
 int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
                       struct snd_ctl_elem_value *ucontrol);
-
+int snd_soc_info_xr_sx(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_info *uinfo);
+int snd_soc_get_xr_sx(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol);
+int snd_soc_put_xr_sx(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol);
+int snd_soc_get_strobe(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol);
+int snd_soc_put_strobe(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol);
 
 /**
  * struct snd_soc_reg_access - Describes whether a given register is
@@ -513,6 +557,7 @@ struct snd_soc_jack_gpio {
 #endif
 
 struct snd_soc_jack {
+        struct mutex mutex;
         struct snd_jack *jack;
         struct snd_soc_codec *codec;
         struct list_head pins;
@@ -711,6 +756,7 @@ struct snd_soc_platform_driver {
         /* platform IO - used for platform DAPM */
         unsigned int (*read)(struct snd_soc_platform *, unsigned int);
         int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
+        int (*bespoke_trigger)(struct snd_pcm_substream *, int);
 };
 
 struct snd_soc_platform {
@@ -746,21 +792,36 @@ struct snd_soc_dai_link {
         const char *cpu_dai_name;
         const struct device_node *cpu_dai_of_node;
         const char *codec_dai_name;
+        int be_id;      /* optional ID for machine driver BE identification */
+
+        const struct snd_soc_pcm_stream *params;
 
         unsigned int dai_fmt;           /* format to set on init */
 
+        enum snd_soc_dpcm_trigger trigger[2]; /* trigger type for DPCM */
+
         /* Keep DAI active over suspend */
         unsigned int ignore_suspend:1;
 
         /* Symmetry requirements */
         unsigned int symmetric_rates:1;
 
+        /* Do not create a PCM for this DAI link (Backend link) */
+        unsigned int no_pcm:1;
+
+        /* This DAI link can route to other DAI links at runtime (Frontend)*/
+        unsigned int dynamic:1;
+
         /* pmdown_time is ignored at stop */
         unsigned int ignore_pmdown_time:1;
 
         /* codec/machine specific init - e.g. add machine controls */
         int (*init)(struct snd_soc_pcm_runtime *rtd);
 
+        /* optional hw_params re-writing for BE and FE sync */
+        int (*be_hw_params_fixup)(struct snd_soc_pcm_runtime *rtd,
+                        struct snd_pcm_hw_params *params);
+
         /* machine stream operations */
         struct snd_soc_ops *ops;
 };
@@ -800,6 +861,7 @@ struct snd_soc_card {
 
         struct list_head list;
         struct mutex mutex;
+        struct mutex dapm_mutex;
 
         bool instantiated;
 
@@ -889,9 +951,11 @@ struct snd_soc_pcm_runtime {
         enum snd_soc_pcm_subclass pcm_subclass;
         struct snd_pcm_ops ops;
 
-        unsigned int complete:1;
         unsigned int dev_registered:1;
 
+        /* Dynamic PCM BE runtime data */
+        struct snd_soc_dpcm_runtime dpcm[2];
+
         long pmdown_time;
 
         /* runtime devices */
@@ -902,6 +966,10 @@ struct snd_soc_pcm_runtime {
         struct snd_soc_dai *cpu_dai;
 
         struct delayed_work delayed_work;
+#ifdef CONFIG_DEBUG_FS
+        struct dentry *debugfs_dpcm_root;
+        struct dentry *debugfs_dpcm_state;
+#endif
 };
 
 /* mixer control */
@@ -916,6 +984,12 @@ struct soc_bytes {
         u32 mask;
 };
 
+/* multi register control */
+struct soc_mreg_control {
+        long min, max;
+        unsigned int regbase, regcount, nbits, invert;
+};
+
 /* enumerated kcontrol */
 struct soc_enum {
         unsigned short reg;