4 files changed, 44 insertions, 3 deletions

diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index 74bc85473b58..15aa5f07c955 100644
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -417,11 +417,13 @@
 #define AC97_RATES_MIC_ADC      4
 #define AC97_RATES_SPDIF        5
 
+#define AC97_NUM_GPIOS          16
 /*
  *
  */
 
 struct snd_ac97;
+struct snd_ac97_gpio_priv;
 struct snd_pcm_chmap;
 
 struct snd_ac97_build_ops {
@@ -529,6 +531,7 @@ struct snd_ac97 {
         struct delayed_work power_work;
 #endif
         struct device dev;
+        struct snd_ac97_gpio_priv *gpio_priv;
 
         struct snd_pcm_chmap *chmaps[2]; /* channel-maps (optional) */
 };
diff --git a/include/sound/hda_register.h b/include/sound/hda_register.h
index 2ae8812d7b1a..94dc6a9772e0 100644
--- a/include/sound/hda_register.h
+++ b/include/sound/hda_register.h
@@ -93,6 +93,9 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 };
 #define AZX_REG_HSW_EM4                 0x100c
 #define AZX_REG_HSW_EM5                 0x1010
 
+/* Skylake/Broxton display HD-A controller Extended Mode registers */
+#define AZX_REG_SKL_EM4L                0x1040
+
 /* PCI space */
 #define AZX_PCIREG_TCSEL                0x44
 
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 7855cfe46b69..97069466c38d 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -49,6 +49,9 @@ struct device;
 #define SND_SOC_DAPM_SIGGEN(wname) \
 {       .id = snd_soc_dapm_siggen, .name = wname, .kcontrol_news = NULL, \
         .num_kcontrols = 0, .reg = SND_SOC_NOPM }
+#define SND_SOC_DAPM_SINK(wname) \
+{       .id = snd_soc_dapm_sink, .name = wname, .kcontrol_news = NULL, \
+        .num_kcontrols = 0, .reg = SND_SOC_NOPM }
 #define SND_SOC_DAPM_INPUT(wname) \
 {       .id = snd_soc_dapm_input, .name = wname, .kcontrol_news = NULL, \
         .num_kcontrols = 0, .reg = SND_SOC_NOPM }
@@ -398,6 +401,7 @@ int snd_soc_dapm_del_routes(struct snd_soc_dapm_context *dapm,
 int snd_soc_dapm_weak_routes(struct snd_soc_dapm_context *dapm,
                              const struct snd_soc_dapm_route *route, int num);
 void snd_soc_dapm_free_widget(struct snd_soc_dapm_widget *w);
+void snd_soc_dapm_reset_cache(struct snd_soc_dapm_context *dapm);
 
 /* dapm events */
 void snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream,
@@ -484,6 +488,7 @@ enum snd_soc_dapm_type {
         snd_soc_dapm_aif_in,            /* audio interface input */
         snd_soc_dapm_aif_out,           /* audio interface output */
         snd_soc_dapm_siggen,            /* signal generator */
+        snd_soc_dapm_sink,
         snd_soc_dapm_dai_in,            /* link to DAI structure */
         snd_soc_dapm_dai_out,
         snd_soc_dapm_dai_link,          /* link between two DAI structures */
diff --git a/include/sound/soc.h b/include/sound/soc.h
index a8b4b9c8b1d2..ea443239cc6d 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 */
@@ -1644,6 +1669,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