Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/davinci-vcif', ...

diff --cc include/sound/soc.h
Simple merge

diff --cc sound/soc/soc-core.c
Simple merge

diff --cc sound/soc/soc-dapm.c
index 89e63166b50c6aaaa4077caea8fa916304933a4c,aa327c92480c56c2609699380594a75ad765fbda,aa327c92480c56c2609699380594a75ad765fbda,c4e3720bea4100a9917950e0b63b8ad63deb9322,aa327c92480c56c2609699380594a75ad765fbda..f4bf21a5539b0e0592cc6e622f7714730c22f0ef
--- 1/sound/soc/soc-dapm.c
--- 2/sound/soc/soc-dapm.c
--- 3/sound/soc/soc-dapm.c
--- 4/sound/soc/soc-dapm.c
--- 5/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@@@@@ -2568,13 -2602,14 -2602,14 -2602,14 -2602,14 +2568,13 @@@@@@ static int snd_soc_dapm_add_path(struc
        }
     
        list_add(&path->list, &dapm->card->paths);
 ----   list_add(&path->list_sink, &wsink->sources);
 ----   list_add(&path->list_source, &wsource->sinks);
 -- -
 -- -   dapm_update_widget_flags(wsource);
 -- -   dapm_update_widget_flags(wsink);
 ++++   snd_soc_dapm_for_each_direction(dir)
 ++++           list_add(&path->list_node[dir], &widgets[dir]->edges[dir]);
     
   -    dapm_update_widget_flags(wsource);
   -    dapm_update_widget_flags(wsink);
   - 
 ----   dapm_mark_dirty(wsource, "Route added");
 ----   dapm_mark_dirty(wsink, "Route added");
 ++++   snd_soc_dapm_for_each_direction(dir) {
 ++++           dapm_update_widget_flags(widgets[dir]);
 ++++           dapm_mark_dirty(widgets[dir], "Route added");
 ++++   }
     
        if (dapm->card->instantiated && path->connect)
                dapm_path_invalidate(path);

diff --cc sound/soc/soc-pcm.c
Simple merge