Merge remote-tracking branches 'asoc/topic/cs42l56', 'asoc/topic/cs42xx8' and 'asoc...

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

diff --cc sound/soc/codecs/Kconfig
Simple merge

diff --cc sound/soc/codecs/Makefile
Simple merge

diff --cc sound/soc/codecs/cs42l51.c
Simple merge

diff --cc sound/soc/codecs/cs42l52.c
Simple merge

diff --cc sound/soc/codecs/wm8962.c
Simple merge

diff --cc sound/soc/omap/ams-delta.c
index 44ae456,56a5219,56a5219,2ac0a0c..669f84d
--- 1/sound/soc/omap/ams-delta.c
--- 2/sound/soc/omap/ams-delta.c
--- 3/sound/soc/omap/ams-delta.c
--- 4/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@@@@ -520,27 -520,29 -520,29 -518,10 +518,8 @@@@@ static int ams_delta_cx20442_init(struc
                return 0;
        }
    
---     /* Add board specific DAPM widgets and routes */
---     ret = snd_soc_dapm_new_controls(dapm, ams_delta_dapm_widgets,
---                                     ARRAY_SIZE(ams_delta_dapm_widgets));
---     if (ret) {
---             dev_warn(card->dev,
---                             "Failed to register DAPM controls, "
---                             "will continue without any.\n");
---             return 0;
---     }
--- 
---     ret = snd_soc_dapm_add_routes(dapm, ams_delta_audio_map,
---                                     ARRAY_SIZE(ams_delta_audio_map));
---     if (ret) {
---             dev_warn(card->dev,
---                             "Failed to set up DAPM routes, "
---                             "will continue with codec default map.\n");
---             return 0;
---     }
--- 
        /* Set up initial pin constellation */
        snd_soc_dapm_disable_pin(dapm, "Mouthpiece");
 ---    snd_soc_dapm_enable_pin(dapm, "Earpiece");
 ---    snd_soc_dapm_enable_pin(dapm, "Microphone");
        snd_soc_dapm_disable_pin(dapm, "Speaker");
        snd_soc_dapm_disable_pin(dapm, "AGCIN");
        snd_soc_dapm_disable_pin(dapm, "AGCOUT");