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

Merge remote-tracking branches 'asoc/topic/nuc900', 'asoc/topic/omap', 'asoc/topic/pxa', 'asoc/topic/rcar', 'asoc/topic/rt5640' and 'asoc/topic/rt5645' into asoc-next
---

6f821c644966e6ccbe9a98e081621b7e1a58dc64
diff --cc sound/soc/omap/ams-delta.c
index 669f84d,56a5219,b0f8dbc,56a5219,56a5219,56a5219,56a5219..bb243c6
--- a/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@@@@@@@ -518,8 -520,29 -518,10 -520,29 -520,29 -520,29 -520,29 +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");