From: Mark Brown <broonie@linaro.org>
Date: Wed, 21 May 2014 23:23:49 +0000 (+0100)
Subject: Merge remote-tracking branches 'asoc/topic/cs42l56', 'asoc/topic/cs42xx8' and 'asoc... 
X-Git-Tag: v3.16-rc1~12^2~24^2~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c5dacf2ca07a1b9a5970cd06cc5eab496860382;p=platform%2Fkernel%2Flinux-stable.git

Merge remote-tracking branches 'asoc/topic/cs42l56', 'asoc/topic/cs42xx8' and 'asoc/topic/davinci' into asoc-next
---

0c5dacf2ca07a1b9a5970cd06cc5eab496860382
diff --cc sound/soc/omap/ams-delta.c
index 44ae456,56a5219,56a5219,2ac0a0c..669f84d
--- a/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");