3 files changed, 19 insertions, 9 deletions

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 1f661a760ae..6e223ff8bf1 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -202,6 +202,14 @@
 #define SOC_VALUE_ENUM_SINGLE_DECL(name, xreg, xshift, xmask, xtexts, xvalues) \
         SOC_VALUE_ENUM_DOUBLE_DECL(name, xreg, xshift, xshift, xmask, xtexts, xvalues)
 
+
+/* DAI Link Host Mode Support */
+#define SND_SOC_DAI_LINK_NO_HOST                0x1
+#define SND_SOC_DAI_LINK_OPT_HOST               0x2
+
+#define snd_soc_get_enum_text(soc_enum, idx) \
+        (soc_enum->texts ? soc_enum->texts[idx] : soc_enum->dtexts[idx])
+
 /*
  * Component probe and remove ordering levels for components with runtime
  * dependencies.
@@ -905,6 +913,7 @@ struct soc_enum {
         unsigned int max;
         unsigned int mask;
         const char * const *texts;
+        char **dtexts;
         const unsigned int *values;
         void *dapm;
 };
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 4e5d87b10e3..5cae2124705 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2124,7 +2124,8 @@ int snd_soc_info_enum_double(struct snd_kcontrol *kcontrol,
         if (uinfo->value.enumerated.item > e->max - 1)
                 uinfo->value.enumerated.item = e->max - 1;
         strcpy(uinfo->value.enumerated.name,
-                e->texts[uinfo->value.enumerated.item]);
+                snd_soc_get_enum_text(e, uinfo->value.enumerated.item));
+
         return 0;
 }
 EXPORT_SYMBOL_GPL(snd_soc_info_enum_double);
@@ -2288,7 +2289,7 @@ int snd_soc_info_enum_ext(struct snd_kcontrol *kcontrol,
         if (uinfo->value.enumerated.item > e->max - 1)
                 uinfo->value.enumerated.item = e->max - 1;
         strcpy(uinfo->value.enumerated.name,
-                e->texts[uinfo->value.enumerated.item]);
+                snd_soc_get_enum_text(e, uinfo->value.enumerated.item));
         return 0;
 }
 EXPORT_SYMBOL_GPL(snd_soc_info_enum_ext);
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 29d0800e134..12f294961af 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -594,7 +594,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
 
                 p->connect = 0;
                 for (i = 0; i < e->max; i++) {
-                        if (!(strcmp(p->name, e->texts[i])) && item == i)
+                        if (!(strcmp(p->name, snd_soc_get_enum_text(e, i))) && item == i)
                                 p->connect = 1;
                 }
         }
@@ -610,7 +610,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
                  * that the default mux choice (the first) will be
                  * correctly powered up during initialization.
                  */
-                if (!strcmp(p->name, e->texts[0]))
+                if (!strcmp(p->name, snd_soc_get_enum_text(e, 0)))
                         p->connect = 1;
         }
         break;
@@ -628,7 +628,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
 
                 p->connect = 0;
                 for (i = 0; i < e->max; i++) {
-                        if (!(strcmp(p->name, e->texts[i])) && item == i)
+                        if (!(strcmp(p->name, snd_soc_get_enum_text(e, i))) && item == i)
                                 p->connect = 1;
                 }
         }
@@ -669,11 +669,11 @@ static int dapm_connect_mux(struct snd_soc_dapm_context *dapm,
         int i;
 
         for (i = 0; i < e->max; i++) {
-                if (!(strcmp(control_name, e->texts[i]))) {
+                if (!(strcmp(control_name, snd_soc_get_enum_text(e, i)))) {
                         list_add(&path->list, &dapm->card->paths);
                         list_add(&path->list_sink, &dest->sources);
                         list_add(&path->list_source, &src->sinks);
-                        path->name = (char*)e->texts[i];
+                        path->name = (char*)snd_soc_get_enum_text(e, i);
                         dapm_set_path_status(dest, path, 0);
                         return 0;
                 }
@@ -1830,12 +1830,12 @@ int snd_soc_dapm_mux_update_power(struct snd_soc_dapm_widget *widget,
                 if (path->kcontrol != kcontrol)
                         continue;
 
-                if (!path->name || !e->texts[mux])
+                if (!path->name || !snd_soc_get_enum_text(e, mux))
                         continue;
 
                 found = 1;
                 /* we now need to match the string in the enum to the path */
-                if (!(strcmp(path->name, e->texts[mux])))
+                if (!(strcmp(path->name, snd_soc_get_enum_text(e, mux))))
                         path->connect = 1; /* new connection */
                 else
                         path->connect = 0; /* old connection must be powered down */